diff --git a/99-Shared/adcore/ADAttrFile.bob b/99-Shared/adcore/ADAttrFile.bob
index 66b2b41dd0c058c859f0557d7c7ae708c73871aa..ff456e7a0f0ad77995bc3bb733e260c7f3ee2792 100644
--- a/99-Shared/adcore/ADAttrFile.bob
+++ b/99-Shared/adcore/ADAttrFile.bob
@@ -4,146 +4,198 @@
   <x>214</x>
   <y>81</y>
   <width>350</width>
-  <height>110</height>
-  <background_color>
-    <color red="187" green="187" blue="187">
-    </color>
-  </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <height>120</height>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <x>127</x>
-    <y>2</y>
-    <width>107</width>
-    <height>21</height>
+    <name>BGGrey02-background_1</name>
+    <y>30</y>
+    <width>350</width>
+    <height>90</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>Attributes</text>
-    <x>130</x>
-    <y>2</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>File:</text>
+    <x>23</x>
+    <y>40</y>
+    <width>40</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #12</name>
-    <width>350</width>
-    <height>110</height>
-    <line_width>1</line_width>
-    <line_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #15</name>
-    <text>File</text>
-    <x>25</x>
-    <y>30</y>
-    <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #18</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDAttributesFile</pv_name>
     <x>71</x>
-    <y>31</y>
+    <y>40</y>
     <width>275</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #22</name>
-    <text>Macros</text>
+    <name>Label</name>
+    <text>Macros:</text>
     <x>5</x>
-    <y>55</y>
+    <y>64</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #25</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDAttributesMacros</pv_name>
     <x>70</x>
-    <y>56</y>
+    <y>65</y>
     <width>275</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
-    <text>Status</text>
+    <name>Label</name>
+    <text>Status:</text>
     <x>5</x>
-    <y>80</y>
+    <y>89</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #32</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDAttributesStatus</pv_name>
     <x>70</x>
-    <y>81</y>
+    <y>90</y>
     <width>275</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_5</name>
+    <width>350</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <class>GROUP-TITLE</class>
+    <text>Attributes</text>
+    <width>350</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDCircularBuff.bob b/99-Shared/adcore/NDCircularBuff.bob
index 05b8140479ff9a00f8e38a119dede26c38a60f94..516d0936ab4711e17d70fb1d4091b7c41f0b10a8 100644
--- a/99-Shared/adcore/NDCircularBuff.bob
+++ b/99-Shared/adcore/NDCircularBuff.bob
@@ -1,1852 +1,2578 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
+<display typeId="org.csstudio.opibuilder.Display" version="1.0.0">
+  <actions hook="false" hook_all="false" />
+  <auto_scale_widgets>
+    <auto_scale_widgets>false</auto_scale_widgets>
+    <min_width>-1</min_width>
+    <min_height>-1</min_height>
+  </auto_scale_widgets>
+  <auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
+  <background_color>
+    <color red="187" green="187" blue="187" />
+  </background_color>
+  <boy_version>5.1.0</boy_version>
+  <foreground_color>
+    <color red="0" green="0" blue="0" />
+  </foreground_color>
+  <grid_space>5</grid_space>
+  <height>600</height>
+  <macros>
+    <include_parent_macros>true</include_parent_macros>
+  </macros>
   <name>NDCircularBuff</name>
+  <rules />
+  <scripts />
+  <show_close_button>true</show_close_button>
+  <show_edit_range>true</show_edit_range>
+  <show_grid>false</show_grid>
+  <show_ruler>true</show_ruler>
+  <snap_to_geometry>false</snap_to_geometry>
+  <widget_type>Display</widget_type>
+  <width>775</width>
+  <wuid>-50bf62f8:16fa37dcb8d:-7627</wuid>
   <x>332</x>
   <y>156</y>
-  <width>775</width>
-  <background_color>
-    <color red="187" green="187" blue="187">
-    </color>
-  </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>775</width>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="30" green="144" blue="255" />
+    </background_color>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>100.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="218" green="218" blue="218" />
+    </foreground_color>
+    <gradient>false</gradient>
     <height>25</height>
+    <horizontal_fill>true</horizontal_fill>
     <line_color>
-      <color red="218" green="218" blue="218">
-      </color>
+      <color red="128" green="0" blue="255" />
     </line_color>
+    <line_style>0</line_style>
+    <line_width>0</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>775</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7626</wuid>
+    <x>0</x>
+    <y>5</y>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="218" green="218" blue="218">
-      </color>
+      <color red="30" green="144" blue="255" />
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>775</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>0.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="77" green="82" blue="164">
-      </color>
+      <color red="45" green="45" blue="45" />
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #12</name>
-    <x>5</x>
-    <y>40</y>
-    <width>380</width>
-    <height>555</height>
-    <line_width>1</line_width>
+    <gradient>false</gradient>
+    <height>345</height>
+    <horizontal_fill>true</horizontal_fill>
     <line_color>
-      <color red="0" green="0" blue="0">
-      </color>
+      <color red="45" green="45" blue="45" />
     </line_color>
-    <background_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </background_color>
+    <line_style>0</line_style>
+    <line_width>1</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
     <transparent>true</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>380</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7624</wuid>
+    <x>390</x>
+    <y>40</y>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #15</name>
-    <pv_name>$(P)$(R)PortName_RBV</pv_name>
-    <x>172</x>
-    <y>45</y>
-    <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="30" green="144" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #19</name>
-    <text>asyn port</text>
-    <x>72</x>
-    <y>44</y>
-    <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #22</name>
-    <text>Plugin type</text>
-    <x>52</x>
-    <y>69</y>
-    <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #25</name>
-    <pv_name>$(P)$(R)PluginType_RBV</pv_name>
-    <x>172</x>
-    <y>70</y>
-    <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>0.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="45" green="45" blue="45" />
     </foreground_color>
+    <gradient>false</gradient>
+    <height>205</height>
+    <horizontal_fill>true</horizontal_fill>
+    <line_color>
+      <color red="45" green="45" blue="45" />
+    </line_color>
+    <line_style>0</line_style>
+    <line_width>1</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>true</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>380</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7623</wuid>
+    <x>390</x>
+    <y>390</y>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="30" green="144" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #29</name>
-    <text>ADCore version</text>
-    <x>22</x>
-    <y>94</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #32</name>
-    <pv_name>$(P)$(R)ADCoreVersion_RBV</pv_name>
-    <x>172</x>
-    <y>95</y>
-    <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>0.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="45" green="45" blue="45" />
     </foreground_color>
+    <gradient>false</gradient>
+    <height>100</height>
+    <horizontal_fill>true</horizontal_fill>
+    <line_color>
+      <color red="45" green="45" blue="45" />
+    </line_color>
+    <line_style>0</line_style>
+    <line_width>1</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>true</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>370</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7622</wuid>
+    <x>395</x>
+    <y>70</y>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="30" green="144" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #36</name>
-    <text>Plugin version</text>
-    <x>22</x>
-    <y>118</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #39</name>
-    <pv_name>$(P)$(R)DriverVersion_RBV</pv_name>
-    <x>172</x>
-    <y>119</y>
-    <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>0.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="45" green="45" blue="45" />
     </foreground_color>
+    <gradient>false</gradient>
+    <height>100</height>
+    <horizontal_fill>true</horizontal_fill>
+    <line_color>
+      <color red="45" green="45" blue="45" />
+    </line_color>
+    <line_style>0</line_style>
+    <line_width>1</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>true</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>370</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7621</wuid>
+    <x>395</x>
+    <y>175</y>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <alpha>255</alpha>
+    <anti_alias>true</anti_alias>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="30" green="144" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
+    <bg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </bg_gradient_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <fg_gradient_color>
+      <color red="255" green="255" blue="255" />
+    </fg_gradient_color>
+    <fill_level>0.0</fill_level>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="45" green="45" blue="45" />
+    </foreground_color>
+    <gradient>false</gradient>
+    <height>100</height>
+    <horizontal_fill>true</horizontal_fill>
+    <line_color>
+      <color red="45" green="45" blue="45" />
+    </line_color>
+    <line_style>0</line_style>
+    <line_width>1</line_width>
+    <name>Rectangle</name>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>true</transparent>
+    <visible>true</visible>
+    <widget_type>Rectangle</widget_type>
+    <width>370</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-7620</wuid>
+    <x>395</x>
+    <y>280</y>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #43</name>
-    <pv_name>$(P)$(R)NDArrayAddress</pv_name>
-    <x>172</x>
-    <y>169</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #47</name>
-    <pv_name>$(P)$(R)NDArrayAddress_RBV</pv_name>
-    <x>278</x>
-    <y>170</y>
-    <height>18</height>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="15" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="77" green="82" blue="164" />
     </foreground_color>
+    <height>25</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <text>$(P)$(R)</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>775</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-761f</wuid>
+    <x>0</x>
+    <y>6</y>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #51</name>
-    <text>Array address</text>
-    <x>32</x>
-    <y>169</y>
-    <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #54</name>
-    <text>Array port</text>
-    <x>62</x>
-    <y>144</y>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <text>Trigger definition</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>180</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e7</wuid>
+    <x>490</x>
+    <y>45</y>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #57</name>
-    <pv_name>$(P)$(R)NDArrayPort</pv_name>
-    <x>172</x>
-    <y>144</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #61</name>
-    <pv_name>$(P)$(R)NDArrayPort_RBV</pv_name>
-    <x>278</x>
-    <y>145</y>
-    <height>18</height>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)PostTriggerQty_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e6</wuid>
+    <x>700</x>
+    <y>421</y>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #65</name>
-    <text>Min. time</text>
-    <x>72</x>
-    <y>219</y>
-    <width>90</width>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <text>Pre-count #</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>110</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e5</wuid>
+    <x>445</x>
+    <y>395</y>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #68</name>
-    <pv_name>$(P)$(R)MinCallbackTime</pv_name>
-    <x>172</x>
-    <y>219</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="115" green="223" blue="255" />
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #72</name>
-    <pv_name>$(P)$(R)MinCallbackTime_RBV</pv_name>
-    <x>278</x>
-    <y>220</y>
-    <height>18</height>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)PreCount</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #76</name>
-    <text>Enable</text>
-    <x>102</x>
-    <y>194</y>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e4</wuid>
+    <x>560</x>
+    <y>395</y>
   </widget>
-  <widget type="combo" version="2.0.0">
-    <name>menu #79</name>
-    <pv_name>$(P)$(R)EnableCallbacks</pv_name>
-    <x>172</x>
-    <y>194</y>
-    <height>20</height>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #82</name>
-    <pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
-    <x>278</x>
-    <y>195</y>
-    <height>18</height>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="70" green="70" blue="70">
-      </color>
-    </background_color>
-    <format>6</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)PreCount_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e3</wuid>
+    <x>625</x>
+    <y>396</y>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #86</name>
-    <pv_name>$(P)$(R)DroppedArrays_RBV</pv_name>
-    <x>278</x>
-    <y>345</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #90</name>
-    <text>Dropped arrays</text>
-    <x>22</x>
-    <y>344</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #93</name>
-    <text>Array Size</text>
-    <x>62</x>
-    <y>394</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #96</name>
-    <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
-    <x>172</x>
-    <y>395</y>
-    <width>65</width>
-    <height>18</height>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)CurrentQty_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e2</wuid>
+    <x>700</x>
+    <y>396</y>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #100</name>
-    <pv_name>$(P)$(R)ArraySize1_RBV</pv_name>
-    <x>242</x>
-    <y>395</y>
-    <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #104</name>
-    <text>Data type</text>
-    <x>72</x>
-    <y>419</y>
-    <width>90</width>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #107</name>
-    <pv_name>$(P)$(R)DataType_RBV</pv_name>
-    <x>172</x>
-    <y>420</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #111</name>
-    <text># dimensions</text>
-    <x>42</x>
-    <y>369</y>
-    <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #114</name>
-    <pv_name>$(P)$(R)NDimensions_RBV</pv_name>
-    <x>172</x>
-    <y>370</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #118</name>
-    <pv_name>$(P)$(R)ArraySize2_RBV</pv_name>
-    <x>312</x>
-    <y>395</y>
-    <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #122</name>
-    <text>Color mode</text>
-    <x>62</x>
-    <y>444</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #125</name>
-    <pv_name>$(P)$(R)ColorMode_RBV</pv_name>
-    <x>172</x>
-    <y>445</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #129</name>
-    <text>Execution time</text>
-    <x>22</x>
-    <y>319</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #132</name>
-    <pv_name>$(P)$(R)ExecutionTime_RBV</pv_name>
-    <x>172</x>
-    <y>320</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #136</name>
-    <text>msec</text>
-    <x>278</x>
-    <y>319</y>
-    <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #139</name>
-    <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
-    <x>278</x>
-    <y>270</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #143</name>
-    <text>Array counter</text>
-    <x>32</x>
-    <y>269</y>
-    <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #146</name>
-    <text>Array rate</text>
-    <x>62</x>
-    <y>294</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #149</name>
-    <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
-    <x>172</x>
-    <y>295</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #153</name>
-    <text>Unique ID</text>
-    <x>72</x>
-    <y>469</y>
-    <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #156</name>
-    <pv_name>$(P)$(R)UniqueId_RBV</pv_name>
-    <x>172</x>
-    <y>470</y>
-    <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #160</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(P)$(R)ArrayCounter</pv_name>
-        <value>0</value>
-        <description>Write</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)ArrayCounter</pv_name>
-    <text>Reset to 0</text>
-    <x>172</x>
-    <y>269</y>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #163</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(P)$(R)DroppedArrays</pv_name>
-        <value>0</value>
-        <description>Write</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)DroppedArrays</pv_name>
-    <text>Reset to 0</text>
-    <x>172</x>
-    <y>344</y>
     <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #166</name>
-    <text>Queue size/free</text>
-    <x>12</x>
-    <y>244</y>
-    <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #169</name>
-    <pv_name>$(P)$(R)QueueFree</pv_name>
-    <x>278</x>
-    <y>244</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="70" green="70" blue="70">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #173</name>
-    <pv_name>$(P)$(R)QueueSize</pv_name>
-    <x>172</x>
-    <y>244</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #177</name>
-    <pv_name>$(P)$(R)TimeStamp_RBV</pv_name>
-    <x>172</x>
-    <y>495</y>
-    <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #181</name>
-    <text>Time stamp</text>
-    <x>62</x>
-    <y>494</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #184</name>
-    <text>Array callbacks</text>
-    <x>12</x>
-    <y>519</y>
-    <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>related display #187</name>
-    <actions>
-      <action type="open_display">
-        <file>NDPluginBaseFull.opi</file>
-        <target>tab</target>
-        <description>NDPluginBase Full</description>
-      </action>
-      <action type="open_display">
-        <file>asynRecord.opi</file>
-        <macros>
-          <R>$(R)AsynIO</R>
-        </macros>
-        <target>tab</target>
-        <description>asynRecord</description>
-      </action>
-    </actions>
-    <text></text>
-    <x>172</x>
-    <y>569</y>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #191</name>
-    <text>More</text>
-    <x>122</x>
-    <y>569</y>
-    <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>menu #194</name>
-    <pv_name>$(P)$(R)ArrayCallbacks</pv_name>
-    <x>172</x>
-    <y>519</y>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #197</name>
-    <pv_name>$(P)$(R)ArrayCallbacks_RBV</pv_name>
-    <x>278</x>
-    <y>520</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="70" green="70" blue="70">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #201</name>
-    <text>Process plugin</text>
-    <x>25</x>
-    <y>544</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #204</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(P)$(R)ProcessPlugin</pv_name>
-        <value>1</value>
-        <description>Write</description>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)ProcessPlugin</pv_name>
-    <text>Process</text>
-    <x>172</x>
-    <y>544</y>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #207</name>
-    <x>390</x>
-    <y>40</y>
-    <width>380</width>
-    <height>345</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #210</name>
-    <text>Trigger definition</text>
-    <x>490</x>
-    <y>45</y>
-    <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #213</name>
-    <x>390</x>
-    <y>390</y>
-    <width>380</width>
-    <height>205</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #216</name>
-    <pv_name>$(P)$(R)PostTriggerQty_RBV</pv_name>
-    <x>700</x>
-    <y>421</y>
-    <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #220</name>
-    <text>Pre-count #</text>
-    <x>445</x>
-    <y>395</y>
-    <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #223</name>
-    <pv_name>$(P)$(R)PreCount</pv_name>
-    <x>560</x>
-    <y>395</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #227</name>
-    <pv_name>$(P)$(R)PreCount_RBV</pv_name>
-    <x>625</x>
-    <y>396</y>
-    <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #231</name>
-    <pv_name>$(P)$(R)CurrentQty_RBV</pv_name>
-    <x>700</x>
-    <y>396</y>
-    <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #235</name>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Trigger A</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>90</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e1</wuid>
     <x>535</x>
     <y>75</y>
-    <width>90</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #238</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerA</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
+    <show_units>false</show_units>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
+    <width>265</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75e0</wuid>
     <x>495</x>
     <y>119</y>
-    <width>265</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #242</name>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerA_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>265</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75df</wuid>
     <x>495</x>
     <y>97</y>
-    <width>265</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #246</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Attribute</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>90</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75de</wuid>
     <x>400</x>
     <y>119</y>
-    <width>90</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #249</name>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Value</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>50</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75dd</wuid>
     <x>440</x>
     <y>144</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #252</name>
-    <pv_name>$(P)$(R)TriggerAVal</pv_name>
-    <x>495</x>
-    <y>145</y>
-    <height>18</height>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="187" green="187" blue="187" />
+    </background_color>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)TriggerAVal</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>100</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75dc</wuid>
+    <x>495</x>
+    <y>145</y>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #256</name>
-    <x>395</x>
-    <y>70</y>
-    <width>370</width>
-    <height>100</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </line_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #259</name>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Trigger B</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>90</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75db</wuid>
     <x>535</x>
     <y>180</y>
-    <width>90</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #262</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerB</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
+    <show_units>false</show_units>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
+    <width>265</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75da</wuid>
     <x>495</x>
     <y>224</y>
-    <width>265</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #266</name>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerB_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>265</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d9</wuid>
     <x>495</x>
     <y>202</y>
-    <width>265</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #270</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Attribute</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>90</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d8</wuid>
     <x>400</x>
     <y>224</y>
-    <width>90</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #273</name>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Value</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>50</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d7</wuid>
     <x>440</x>
     <y>249</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #276</name>
-    <pv_name>$(P)$(R)TriggerBVal</pv_name>
-    <x>495</x>
-    <y>250</y>
-    <height>18</height>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="187" green="187" blue="187" />
+    </background_color>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)TriggerBVal</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>100</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d6</wuid>
+    <x>495</x>
+    <y>250</y>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #280</name>
-    <x>395</x>
-    <y>175</y>
-    <width>370</width>
-    <height>100</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </line_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #283</name>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Calculation</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>110</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d5</wuid>
     <x>525</x>
     <y>285</y>
-    <width>110</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #286</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerCalc</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
+    <show_units>false</show_units>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
+    <width>265</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d4</wuid>
     <x>495</x>
     <y>329</y>
-    <width>265</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #290</name>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>4</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)TriggerCalc_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>265</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d3</wuid>
     <x>495</x>
     <y>307</y>
-    <width>265</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #294</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Calc</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>40</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d2</wuid>
     <x>450</x>
     <y>329</y>
-    <width>40</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #297</name>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Value</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>50</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d1</wuid>
     <x>440</x>
     <y>354</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #300</name>
-    <pv_name>$(P)$(R)TriggerCalcVal</pv_name>
-    <x>495</x>
-    <y>355</y>
-    <height>18</height>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="187" green="187" blue="187" />
+    </background_color>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)TriggerCalcVal</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>100</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75d0</wuid>
+    <x>495</x>
+    <y>355</y>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #304</name>
-    <x>395</x>
-    <y>280</y>
-    <width>370</width>
-    <height>100</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </line_color>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
     <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
+      <color red="255" green="255" blue="255" />
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #307</name>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Post-count #</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>120</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75cf</wuid>
     <x>435</x>
     <y>420</y>
-    <width>120</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #310</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)PostCount</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
+    <show_units>false</show_units>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
+    <width>60</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75ce</wuid>
     <x>560</x>
     <y>420</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #314</name>
-    <pv_name>$(P)$(R)PostCount_RBV</pv_name>
-    <x>625</x>
-    <y>421</y>
-    <width>60</width>
-    <height>18</height>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)PostCount_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75cd</wuid>
+    <x>625</x>
+    <y>421</y>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>related display #318</name>
-    <actions>
-      <action type="open_display">
-        <file>NDCircularBuffHelp.opi</file>
-        <target>tab</target>
+  <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+    <actions hook="false" hook_all="false">
+      <action type="OPEN_DISPLAY">
+        <path>NDCircularBuffHelp.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+        </macros>
+        <mode>1</mode>
         <description>Help</description>
       </action>
     </actions>
+    <alarm_pulsing>false</alarm_pulsing>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <image></image>
+    <name>Action Button</name>
+    <push_action_index>0</push_action_index>
+    <pv_name></pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <style>0</style>
     <text>Help</text>
+    <toggle_button>false</toggle_button>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <visible>true</visible>
+    <widget_type>Action Button</widget_type>
+    <width>69</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75cc</wuid>
     <x>685</x>
     <y>285</y>
-    <width>69</width>
-    <height>20</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #321</name>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)ActualTriggerCount_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75cb</wuid>
     <x>700</x>
     <y>446</y>
-    <width>60</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #325</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Capture status</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>140</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75ca</wuid>
     <x>415</x>
     <y>495</y>
-    <width>140</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #328</name>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Trigger status</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>140</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c9</wuid>
     <x>415</x>
     <y>520</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #331</name>
-    <pv_name>$(P)$(R)StatusMessage</pv_name>
-    <x>560</x>
-    <y>546</y>
-    <width>200</width>
-    <height>18</height>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="218" green="218" blue="218" />
+    </background_color>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="10" green="0" blue="184" />
     </foreground_color>
-    <background_color>
-      <color red="218" green="218" blue="218">
-      </color>
-    </background_color>
-    <format>1</format>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
+    <pv_name>$(P)$(R)StatusMessage</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>200</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c8</wuid>
+    <x>560</x>
+    <y>546</y>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #335</name>
-    <actions>
-      <action type="write_pv">
+  <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+    <actions hook="false" hook_all="false">
+      <action type="WRITE_PV">
         <pv_name>$(P)$(R)Capture</pv_name>
         <value>0</value>
-        <description>Write</description>
+        <timeout>10</timeout>
+        <confirm_message></confirm_message>
+        <description></description>
       </action>
     </actions>
+    <alarm_pulsing>false</alarm_pulsing>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <image></image>
+    <name>Action Button</name>
+    <push_action_index>0</push_action_index>
     <pv_name>$(P)$(R)Capture</pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <style>0</style>
     <text>Stop</text>
+    <toggle_button>false</toggle_button>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <visible>true</visible>
+    <widget_type>Action Button</widget_type>
+    <width>60</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c7</wuid>
     <x>565</x>
     <y>570</y>
-    <width>60</width>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #338</name>
-    <actions>
-      <action type="write_pv">
+  <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+    <actions hook="false" hook_all="false">
+      <action type="WRITE_PV">
         <pv_name>$(P)$(R)Capture</pv_name>
         <value>1</value>
-        <description>Write</description>
+        <timeout>10</timeout>
+        <confirm_message></confirm_message>
+        <description></description>
       </action>
     </actions>
+    <alarm_pulsing>false</alarm_pulsing>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <image></image>
+    <name>Action Button</name>
+    <push_action_index>0</push_action_index>
     <pv_name>$(P)$(R)Capture</pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <style>0</style>
     <text>Start</text>
+    <toggle_button>false</toggle_button>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <visible>true</visible>
+    <widget_type>Action Button</widget_type>
+    <width>60</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c6</wuid>
     <x>465</x>
     <y>570</y>
-    <width>60</width>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>message button #341</name>
-    <actions>
-      <action type="write_pv">
+  <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+    <actions hook="false" hook_all="false">
+      <action type="WRITE_PV">
         <pv_name>$(P)$(R)Trigger</pv_name>
         <value>1</value>
-        <description>Write</description>
+        <timeout>10</timeout>
+        <confirm_message></confirm_message>
+        <description></description>
       </action>
     </actions>
+    <alarm_pulsing>false</alarm_pulsing>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
+    <image></image>
+    <name>Action Button</name>
+    <push_action_index>0</push_action_index>
     <pv_name>$(P)$(R)Trigger</pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <style>0</style>
     <text>Trigger</text>
+    <toggle_button>false</toggle_button>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <visible>true</visible>
+    <widget_type>Action Button</widget_type>
+    <width>60</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c5</wuid>
     <x>665</x>
     <y>570</y>
-    <width>60</width>
-    <height>20</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="45" green="45" blue="45" />
     </background_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #344</name>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>true</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color name="OK" red="61" green="216" blue="61" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)Trigger_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>120</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c4</wuid>
     <x>560</x>
     <y>521</y>
-    <width>120</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="45" green="45" blue="45" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <forecolor_alarm_sensitive>true</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color name="OK" red="61" green="216" blue="61" />
     </foreground_color>
-    <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #348</name>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)Capture_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>120</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c3</wuid>
     <x>560</x>
     <y>496</y>
-    <width>120</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="45" green="45" blue="45">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #352</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Status</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c2</wuid>
     <x>495</x>
     <y>545</y>
-    <width>60</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <height>20</height>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #355</name>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Preset triggers</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>150</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c1</wuid>
     <x>405</x>
     <y>445</y>
-    <width>150</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>3</border_style>
+    <border_width>1</border_width>
+    <confirm_message></confirm_message>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #358</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>20</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>1.7976931348623157E308</maximum>
+    <minimum>-1.7976931348623157E308</minimum>
+    <multiline_input>false</multiline_input>
+    <name>Text Input</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)PresetTriggerCount</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <selector_type>0</selector_type>
+    <show_units>false</show_units>
+    <style>0</style>
+    <text></text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Text Input</widget_type>
+    <width>60</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75c0</wuid>
     <x>560</x>
     <y>445</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #362</name>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
+    </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)PresetTriggerCount_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>60</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75bf</wuid>
     <x>625</x>
     <y>446</y>
-    <width>60</width>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255" />
+    </background_color>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #366</name>
+    <height>20</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <name>Label</name>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
     <text>Flush on trigger</text>
+    <tooltip></tooltip>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Label</widget_type>
+    <width>150</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75be</wuid>
     <x>405</x>
     <y>470</y>
-    <width>150</width>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <alarm_pulsing>false</alarm_pulsing>
+    <auto_size>false</auto_size>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="187" green="187" blue="187" />
+    </background_color>
+    <border_alarm_sensitive>true</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <fontdata fontName="Sans" height="11" style="0" pixels="false" />
     </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #369</name>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <foreground_color>
+      <color red="10" green="0" blue="184" />
+    </foreground_color>
+    <format_type>1</format_type>
+    <height>18</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Text Update</name>
+    <precision>0</precision>
+    <precision_from_pv>true</precision_from_pv>
     <pv_name>$(P)$(R)FlushOnSoftTrg_RBV</pv_name>
+    <pv_value />
+    <rotation_angle>0.0</rotation_angle>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_units>false</show_units>
+    <text>######</text>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>true</visible>
+    <widget_type>Text Update</widget_type>
+    <width>100</width>
+    <wrap_words>false</wrap_words>
+    <wuid>-50bf62f8:16fa37dcb8d:-75bd</wuid>
     <x>665</x>
     <y>471</y>
-    <height>18</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0.0">
+    <actions_from_pv>true</actions_from_pv>
+    <alarm_pulsing>false</alarm_pulsing>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <background_color>
+      <color red="115" green="223" blue="255" />
+    </background_color>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>6</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
     </font>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
+      <color red="0" green="0" blue="0" />
     </foreground_color>
-    <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="combo" version="2.0.0">
-    <name>menu #373</name>
+    <height>20</height>
+    <label></label>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)FlushOnSoftTrg</pv_name>
+    <pv_value />
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_down_arrow>false</show_down_arrow>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <transparent>false</transparent>
+    <visible>true</visible>
+    <widget_type>Menu Button</widget_type>
+    <width>100</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-75bc</wuid>
     <x>560</x>
     <y>470</y>
-    <height>20</height>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
+    <actions hook="false" hook_all="false" />
     <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
+      <color red="187" green="187" blue="187" />
     </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Noto Sans" height="9" style="0" pixels="false">Default</opifont.name>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0" />
+    </foreground_color>
+    <group_name></group_name>
+    <height>555</height>
+    <macros>
+      <include_parent_macros>true</include_parent_macros>
+    </macros>
+    <name>Linking Container</name>
+    <opi_file>NDPluginBase.opi</opi_file>
+    <resize_behaviour>2</resize_behaviour>
+    <rules />
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <tooltip></tooltip>
+    <visible>true</visible>
+    <widget_type>Linking Container</widget_type>
+    <width>380</width>
+    <wuid>-50bf62f8:16fa37dcb8d:-74a0</wuid>
+    <x>5</x>
+    <y>40</y>
   </widget>
-</display>
+</display>
\ No newline at end of file
diff --git a/99-Shared/adcore/NDCircularBuffHelp.bob b/99-Shared/adcore/NDCircularBuffHelp.bob
index f1c8858b6f2538a8e07b40a42125b2a0ca55db70..994b716e11231f9b723cd2dbcfc1e40c9e05ee7e 100644
--- a/99-Shared/adcore/NDCircularBuffHelp.bob
+++ b/99-Shared/adcore/NDCircularBuffHelp.bob
@@ -6,167 +6,391 @@
   <width>510</width>
   <height>334</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="label" version="2.0.0">
-    <name>text #6</name>
+    <name>Label</name>
     <text>Explanation of NDCircularBuff triggering</text>
     <x>10</x>
     <y>5</y>
     <width>400</width>
     <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>Variables in trigger calculation expression</text>
+    <name>Label</name>
+    <text>Variables in trigger calculation expression:</text>
     <x>5</x>
     <y>35</y>
     <width>430</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
-    <text>Example expressions</text>
+    <name>Label</name>
+    <text>Example expressions:</text>
     <x>5</x>
     <y>200</y>
     <width>190</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #15</name>
+    <name>Label</name>
     <text>A  The current value of the TriggerA attribute</text>
     <x>20</x>
     <y>60</y>
     <width>322</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #18</name>
+    <name>Label</name>
     <text>B  The current value of the TriggerB attribute</text>
     <x>20</x>
     <y>79</y>
     <width>322</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #21</name>
+    <name>Label</name>
     <text>C  The value of the PreCount record</text>
     <x>20</x>
     <y>98</y>
     <width>245</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #24</name>
+    <name>Label</name>
     <text>D  The value of the PostCount record</text>
     <x>20</x>
     <y>117</y>
     <width>252</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #27</name>
+    <name>Label</name>
     <text>E  The value of the CurrentQty_RBV record</text>
     <x>20</x>
     <y>136</y>
     <width>287</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #30</name>
+    <name>Label</name>
     <text>F  The value of the PostTriggerQty_RBV record</text>
     <x>20</x>
     <y>155</y>
     <width>315</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #33</name>
+    <name>Label</name>
     <text>G  The value of the Trigger_RBV record</text>
     <x>20</x>
     <y>174</y>
     <width>266</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #36</name>
+    <name>Label</name>
     <text>A&lt;200</text>
     <x>24</x>
     <y>225</y>
     <width>35</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #39</name>
+    <name>Label</name>
     <text>A is less than 200.</text>
     <x>173</x>
     <y>225</y>
     <width>133</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #42</name>
+    <name>Label</name>
     <text>A&gt;1.5*H &amp;&amp; E&gt;50;H:=A</text>
     <x>20</x>
     <y>250</y>
     <width>140</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
+    <name>Label</name>
     <text>A is more than 150% of previous value of A</text>
     <x>173</x>
     <y>250</y>
     <width>294</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
+    <name>Label</name>
     <text>and there are at least 50 images in the buffer.</text>
     <x>173</x>
     <y>269</y>
     <width>329</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #51</name>
+    <name>Label</name>
     <text>H is set to A after evaluation.</text>
     <x>173</x>
     <y>288</y>
     <width>217</width>
     <height>14</height>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDFileBase.bob b/99-Shared/adcore/NDFileBase.bob
index d4e03d700bfa79a1344eeed3bc81504db0d3b3ae..ee3610a95b4b49a230ccd78954730191cfaaf701 100644
--- a/99-Shared/adcore/NDFileBase.bob
+++ b/99-Shared/adcore/NDFileBase.bob
@@ -6,538 +6,770 @@
   <width>675</width>
   <height>405</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
+    <name>BGGrey02-background</name>
     <width>675</width>
     <height>405</height>
-    <line_width>1</line_width>
+    <line_width>2</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <width>675</width>
+    <height>405</height>
+    <line_width>0</line_width>
+    <line_color>
       <color red="0" green="0" blue="0">
       </color>
+    </line_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
     </background_color>
     <transparent>true</transparent>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>Last filename</text>
+    <name>Label</name>
+    <text>Last filename:</text>
     <x>27</x>
     <y>206</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #12</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FullFileName_RBV</pv_name>
     <x>166</x>
     <y>207</y>
     <width>500</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
-    <text>Filename format</text>
+    <name>Label</name>
+    <text>Filename format:</text>
     <x>7</x>
     <y>181</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #19</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileTemplate_RBV</pv_name>
     <x>166</x>
     <y>158</y>
     <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #23</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileTemplate</pv_name>
     <x>166</x>
     <y>181</y>
     <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #27</name>
-    <text>Auto increment</text>
+    <name>Label</name>
+    <text>Auto increment:</text>
     <x>17</x>
     <y>133</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #30</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoIncrement</pv_name>
     <x>166</x>
     <y>133</y>
     <width>64</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #33</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoIncrement_RBV</pv_name>
     <x>235</x>
     <y>134</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #37</name>
-    <text>Next file #</text>
+    <name>Label</name>
+    <text>Next file #:</text>
     <x>47</x>
     <y>107</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #40</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileNumber</pv_name>
     <x>166</x>
     <y>106</y>
     <width>60</width>
-    <height>22</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #44</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileNumber_RBV</pv_name>
     <x>231</x>
     <y>108</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
-    <text>File name</text>
+    <name>Label</name>
+    <text>File name:</text>
     <x>67</x>
     <y>81</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #51</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileName</pv_name>
     <x>166</x>
     <y>81</y>
     <width>500</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #55</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileName_RBV</pv_name>
     <x>166</x>
     <y>58</y>
     <width>175</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #59</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FilePath_RBV</pv_name>
     <x>166</x>
     <y>10</y>
     <width>385</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #63</name>
-    <text>File path</text>
+    <name>Label</name>
+    <text>File path:</text>
     <x>67</x>
     <y>33</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #66</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FilePath</pv_name>
     <x>166</x>
     <y>33</y>
     <width>500</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #70</name>
+    <name>Label</name>
     <text>Exists:</text>
-    <x>555</x>
+    <x>569</x>
     <y>10</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #73</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FilePathExists_RBV</pv_name>
-    <x>630</x>
+    <x>624</x>
     <y>10</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #77</name>
+    <name>Label</name>
     <text>Example: %s%s_%3.3d.$(EXT)</text>
     <x>340</x>
     <y>181</y>
     <width>260</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #80</name>
-    <text>Temp. suffix</text>
+    <name>Label</name>
+    <text>Temp. suffix:</text>
     <x>355</x>
     <y>107</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #83</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TempSuffix</pv_name>
     <x>480</x>
     <y>106</y>
     <width>60</width>
-    <height>22</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #87</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TempSuffix_RBV</pv_name>
     <x>545</x>
     <y>108</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #91</name>
-    <text>Create dir. depth</text>
+    <name>Label</name>
+    <text>Create dir. depth:</text>
     <x>348</x>
     <y>57</y>
     <width>170</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #94</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)CreateDirectory</pv_name>
     <x>523</x>
     <y>56</y>
     <width>40</width>
-    <height>22</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #98</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)CreateDirectory_RBV</pv_name>
     <x>568</x>
     <y>58</y>
     <width>40</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #102</name>
-    <text>Auto save</text>
+    <name>Label</name>
+    <text>Auto save:</text>
     <x>417</x>
     <y>256</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #105</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoSave</pv_name>
     <x>511</x>
     <y>256</y>
     <width>64</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #108</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoSave_RBV</pv_name>
     <x>580</x>
     <y>257</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #112</name>
-    <text>Save file</text>
+    <name>Label</name>
+    <text>Save file:</text>
     <x>67</x>
     <y>256</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #115</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)WriteFile</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)WriteFile</pv_name>
@@ -546,30 +778,45 @@
     <y>256</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #118</name>
-    <text>Read file</text>
+    <name>Label</name>
+    <text>Read file:</text>
     <x>246</x>
     <y>256</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #121</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)ReadFile</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)ReadFile</pv_name>
@@ -578,18 +825,21 @@
     <y>256</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #124</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)Capture</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)Capture</pv_name>
@@ -598,30 +848,45 @@
     <y>326</y>
     <width>59</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #127</name>
-    <text>Capture</text>
+    <name>Label</name>
+    <text>Capture:</text>
     <x>86</x>
     <y>326</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #130</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)Capture</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)Capture</pv_name>
@@ -630,357 +895,492 @@
     <y>326</y>
     <width>59</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #133</name>
-    <text>Write mode</text>
+    <name>Label</name>
+    <text>Write mode:</text>
     <x>57</x>
     <y>282</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #136</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)FileWriteMode</pv_name>
     <x>166</x>
     <y>282</y>
     <width>80</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #139</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileWriteMode_RBV</pv_name>
     <x>254</x>
     <y>283</y>
     <width>70</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #143</name>
-    <text># Capture</text>
+    <name>Label</name>
+    <text># Capture:</text>
     <x>329</x>
     <y>282</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #146</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumCapture</pv_name>
     <x>428</x>
     <y>281</y>
     <width>60</width>
-    <height>22</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #150</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumCaptured_RBV</pv_name>
-    <x>588</x>
+    <x>581</x>
     <y>283</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #154</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumCapture_RBV</pv_name>
     <x>493</x>
     <y>283</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #158</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)WriteFile_RBV</pv_name>
     <x>166</x>
     <y>234</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="40" green="147" blue="21">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #162</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ReadFile_RBV</pv_name>
     <x>341</x>
     <y>234</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="40" green="147" blue="21">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #166</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)Capture_RBV</pv_name>
     <x>166</x>
     <y>304</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="40" green="147" blue="21">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #170</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)DeleteDriverFile</pv_name>
     <x>511</x>
     <y>326</y>
     <width>64</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #173</name>
-    <text>Delete driver file</text>
+    <name>Label</name>
+    <text>Delete driver file:</text>
     <x>322</x>
     <y>326</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #176</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DeleteDriverFile_RBV</pv_name>
     <x>580</x>
     <y>327</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #180</name>
-    <text>Write status</text>
+    <name>Label</name>
+    <text>Write status:</text>
     <x>36</x>
     <y>353</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #183</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)WriteStatus</pv_name>
     <x>165</x>
     <y>353</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="40" green="147" blue="21">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #187</name>
-    <text>Write message</text>
+    <name>Label</name>
+    <text>Write message:</text>
     <x>26</x>
     <y>378</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #190</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)WriteMessage</pv_name>
     <x>165</x>
     <y>381</y>
     <width>505</width>
-    <height>14</height>
     <foreground_color>
-      <color red="253" green="0" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #194</name>
-    <text>Lazy open</text>
+    <name>Label</name>
+    <text>Lazy open:</text>
     <x>385</x>
     <y>132</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #197</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)LazyOpen</pv_name>
     <x>480</x>
     <y>132</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #200</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)LazyOpen_RBV</pv_name>
     <x>545</x>
     <y>133</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #204</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>createDirectoryHelp.opi</file>
@@ -992,9 +1392,14 @@
     <y>57</y>
     <width>59</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDFileHDF5.bob b/99-Shared/adcore/NDFileHDF5.bob
index 712655f42c5a700df4d85354b774bfec34a56a69..b92a270265027e1ba6af16df619324a59d8cb6f9 100644
--- a/99-Shared/adcore/NDFileHDF5.bob
+++ b/99-Shared/adcore/NDFileHDF5.bob
@@ -3,1599 +3,2135 @@
   <name>NDFileHDF5</name>
   <x>85</x>
   <y>65</y>
-  <width>1070</width>
-  <height>850</height>
+  <width>1300</width>
+  <height>1000</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>1070</width>
-    <height>26</height>
+    <name>BGGrey02-background_2</name>
+    <x>395</x>
+    <y>480</y>
+    <width>675</width>
+    <height>455</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>1070</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_8</name>
+    <x>736</x>
+    <y>704</y>
+    <width>314</width>
+    <height>110</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    </background_color>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #12</name>
-    <file>NDPluginBase.bob</file>
-    <x>5</x>
-    <y>40</y>
-    <width>380</width>
-    <height>555</height>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_7</name>
+    <x>737</x>
+    <y>500</y>
+    <width>313</width>
+    <height>187</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_6</name>
+    <x>405</x>
+    <y>500</y>
+    <width>315</width>
+    <height>313</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="action_button" version="3.0.0">
+      <name>Menu Button</name>
+      <actions>
+        <action type="open_display">
+          <file>NDFileHDF5_ExtraDims.opi</file>
+          <target>tab</target>
+          <description>Extra dimensions</description>
+        </action>
+        <action type="open_display">
+          <file>NDFileHDF5_Positions.opi</file>
+          <target>tab</target>
+          <description>Positions</description>
+        </action>
+      </actions>
+      <text>Menu Button Label</text>
+      <x>126</x>
+      <y>279</y>
+      <width>110</width>
+      <height>20</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>More</text>
+      <x>81</x>
+      <y>277</y>
+      <width>40</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #14</name>
-    <x>390</x>
-    <y>450</y>
-    <width>675</width>
-    <height>360</height>
-    <line_width>1</line_width>
+    <name>BGGrey02-background_1</name>
+    <x>10</x>
+    <y>634</y>
+    <width>380</width>
+    <height>301</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1070</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>composite #17</name>
-    <file>NDFileBase.bob</file>
-    <x>390</x>
-    <y>40</y>
+    <name>Linking Container</name>
+    <file>NDFileBase.opi</file>
+    <x>395</x>
+    <y>65</y>
     <width>675</width>
     <height>405</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>724</x>
+    <y>707</y>
+    <width>303</width>
+    <height>100</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="187" green="187" blue="187">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Level:</text>
+      <x>67</x>
+      <y>77</y>
+      <width>50</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Compressor:</text>
+      <x>17</x>
+      <y>55</y>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Shuffle:</text>
+      <x>47</x>
+      <y>33</y>
+      <width>70</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button</name>
+      <pv_name>$(P)$(R)BloscCompressor</pv_name>
+      <x>122</x>
+      <y>55</y>
+      <width>95</width>
+      <height>20</height>
+      <foreground_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R)BloscLevel</pv_name>
+      <x>122</x>
+      <y>77</y>
+      <width>95</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button</name>
+      <pv_name>$(P)$(R)BloscShuffle</pv_name>
+      <x>122</x>
+      <y>33</y>
+      <width>95</width>
+      <height>20</height>
+      <foreground_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="Read_Background" red="230" green="235" blue="232">
+        </color>
+      </background_color>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)BloscShuffle_RBV</pv_name>
+      <x>225</x>
+      <y>33</y>
+      <width>90</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)BloscCompressor_RBV</pv_name>
+      <x>225</x>
+      <y>55</y>
+      <width>90</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)BloscLevel_RBV</pv_name>
+      <x>225</x>
+      <y>77</y>
+      <width>90</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Blosc</text>
+      <x>135</x>
+      <y>4</y>
+      <width>50</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>425</x>
+    <y>845</y>
+    <width>641</width>
+    <height>68</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="187" green="187" blue="187">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #19</name>
-    <text>N-bit offset bits</text>
-    <x>395</x>
-    <y>509</y>
-    <width>170</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1070</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>N-bit offset bits:</text>
+    <x>384</x>
+    <y>566</y>
+    <width>170</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #22</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)DataBitsOffset</pv_name>
-    <x>570</x>
-    <y>509</y>
+    <x>560</x>
+    <y>567</y>
     <width>60</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #26</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DataBitsOffset_RBV</pv_name>
-    <x>635</x>
-    <y>510</y>
+    <x>625</x>
+    <y>568</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #30</name>
-    <text>SZip # pixels</text>
-    <x>435</x>
-    <y>534</y>
+    <name>Label</name>
+    <text>SZip # pixels:</text>
+    <x>425</x>
+    <y>592</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #33</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SZipNumPixels</pv_name>
-    <x>570</x>
-    <y>534</y>
+    <x>560</x>
+    <y>592</y>
     <width>60</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #37</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SZipNumPixels_RBV</pv_name>
-    <x>635</x>
-    <y>535</y>
+    <x>625</x>
+    <y>593</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #41</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)Compression_RBV</pv_name>
-    <x>635</x>
-    <y>460</y>
+    <x>625</x>
+    <y>518</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
-    <text>Compression</text>
-    <x>455</x>
-    <y>459</y>
+    <name>Label</name>
+    <text>Compression:</text>
+    <x>445</x>
+    <y>517</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #48</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)Compression</pv_name>
-    <x>570</x>
-    <y>459</y>
+    <x>560</x>
+    <y>517</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #51</name>
-    <text>N-bit data bits</text>
-    <x>415</x>
-    <y>484</y>
+    <name>Label</name>
+    <text>N-bit data bits:</text>
+    <x>405</x>
+    <y>542</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #54</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumDataBits</pv_name>
-    <x>570</x>
-    <y>484</y>
+    <x>560</x>
+    <y>542</y>
     <width>60</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #58</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumDataBits_RBV</pv_name>
-    <x>635</x>
-    <y>485</y>
+    <x>625</x>
+    <y>543</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #62</name>
-    <text>SWMR active</text>
-    <x>795</x>
-    <y>534</y>
+    <name>Label</name>
+    <text>SWMR active:</text>
+    <x>767</x>
+    <y>592</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #65</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SWMRActive_RBV</pv_name>
-    <x>910</x>
-    <y>535</y>
+    <x>882</x>
+    <y>593</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #69</name>
-    <text>SWMR callbacks</text>
-    <x>765</x>
-    <y>559</y>
+    <name>Label</name>
+    <text>SWMR callbacks:</text>
+    <x>737</x>
+    <y>617</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #72</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SWMRCbCounter_RBV</pv_name>
-    <x>910</x>
-    <y>560</y>
+    <x>882</x>
+    <y>618</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #76</name>
+    <name>Label</name>
     <text>SWMR Support</text>
-    <x>840</x>
-    <y>459</y>
+    <x>812</x>
+    <y>517</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #79</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SWMRSupported_RBV</pv_name>
-    <x>910</x>
-    <y>485</y>
+    <x>882</x>
+    <y>543</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #83</name>
-    <text>SWMR supported</text>
-    <x>765</x>
-    <y>484</y>
+    <name>Label</name>
+    <text>SWMR supported:</text>
+    <x>737</x>
+    <y>542</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #86</name>
-    <text>SWMR mode</text>
-    <x>815</x>
-    <y>509</y>
+    <name>Label</name>
+    <text>SWMR mode:</text>
+    <x>787</x>
+    <y>567</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #89</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)SWMRMode</pv_name>
-    <x>910</x>
-    <y>509</y>
+    <x>882</x>
+    <y>567</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #92</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SWMRMode_RBV</pv_name>
-    <x>975</x>
-    <y>510</y>
+    <x>947</x>
+    <y>568</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #96</name>
-    <x>5</x>
-    <y>600</y>
-    <width>380</width>
-    <height>235</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <format>6</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #99</name>
-    <x>740</x>
-    <y>455</y>
-    <width>320</width>
-    <height>155</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Flush to disk:</text>
+    <x>747</x>
+    <y>642</y>
+    <width>130</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #102</name>
-    <x>740</x>
-    <y>615</y>
-    <width>320</width>
-    <height>100</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="rectangle" version="2.0.0">
-      <name>rectangle #105</name>
-      <width>320</width>
-      <height>100</height>
-      <line_width>1</line_width>
-      <line_color>
-        <color red="0" green="0" blue="0">
-        </color>
-      </line_color>
-      <background_color>
-        <color red="0" green="0" blue="0">
-        </color>
-      </background_color>
-      <transparent>true</transparent>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #108</name>
-      <text>Level</text>
-      <x>67</x>
-      <y>77</y>
-      <width>50</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #111</name>
-      <text>Compressor</text>
-      <x>17</x>
-      <y>55</y>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #114</name>
-      <text>Shuffle</text>
-      <x>47</x>
-      <y>33</y>
-      <width>70</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="combo" version="2.0.0">
-      <name>menu #117</name>
-      <pv_name>$(P)$(R)BloscCompressor</pv_name>
-      <x>122</x>
-      <y>55</y>
-      <width>95</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>text entry #120</name>
-      <pv_name>$(P)$(R)BloscLevel</pv_name>
-      <x>122</x>
-      <y>77</y>
-      <width>95</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-      <format>1</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="combo" version="2.0.0">
-      <name>menu #124</name>
-      <pv_name>$(P)$(R)BloscShuffle</pv_name>
-      <x>122</x>
-      <y>33</y>
-      <width>95</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #127</name>
-      <pv_name>$(P)$(R)BloscShuffle_RBV</pv_name>
-      <x>225</x>
-      <y>33</y>
-      <width>90</width>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="187" green="187" blue="187">
-        </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #131</name>
-      <pv_name>$(P)$(R)BloscCompressor_RBV</pv_name>
-      <x>225</x>
-      <y>55</y>
-      <width>90</width>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="187" green="187" blue="187">
-        </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #135</name>
-      <pv_name>$(P)$(R)BloscLevel_RBV</pv_name>
-      <x>225</x>
-      <y>77</y>
-      <width>90</width>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="187" green="187" blue="187">
-        </color>
-      </background_color>
-      <format>1</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #139</name>
-      <text>Blosc</text>
-      <x>135</x>
-      <y>4</y>
-      <width>50</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <auto_size>true</auto_size>
-    </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #142</name>
-    <text>Flush to disk</text>
-    <x>775</x>
-    <y>584</y>
-    <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #145</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)FlushNow</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)FlushNow</pv_name>
     <text>Flush now</text>
-    <x>910</x>
-    <y>585</y>
+    <x>882</x>
+    <y>643</y>
     <width>80</width>
     <height>20</height>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #148</name>
-    <text>Store performance</text>
-    <x>395</x>
-    <y>609</y>
+    <name>Label</name>
+    <text>Store performance:</text>
+    <x>385</x>
+    <y>667</y>
     <width>170</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #151</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)StorePerform</pv_name>
-    <x>570</x>
-    <y>609</y>
+    <x>560</x>
+    <y>667</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #154</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)StorePerform_RBV</pv_name>
-    <x>635</x>
-    <y>610</y>
+    <x>625</x>
+    <y>668</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #158</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)RunTime</pv_name>
-    <x>570</x>
-    <y>660</y>
+    <x>560</x>
+    <y>718</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #162</name>
-    <text>Run time</text>
-    <x>485</x>
-    <y>659</y>
+    <name>Label</name>
+    <text>Run time:</text>
+    <x>475</x>
+    <y>717</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #165</name>
-    <text>I/O speed</text>
-    <x>475</x>
-    <y>684</y>
+    <name>Label</name>
+    <text>I/O speed:</text>
+    <x>465</x>
+    <y>742</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #168</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)IOSpeed</pv_name>
-    <x>570</x>
-    <y>685</y>
+    <x>560</x>
+    <y>743</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #172</name>
-    <text>More</text>
-    <x>496</x>
-    <y>709</y>
-    <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>related display #175</name>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
     <actions>
-      <action type="open_display">
-        <file>NDFileHDF5_ExtraDims.opi</file>
-        <target>tab</target>
-        <description>Extra dimensions</description>
-      </action>
-      <action type="open_display">
-        <file>NDFileHDF5_Positions.opi</file>
-        <target>tab</target>
-        <description>Positions</description>
-      </action>
     </actions>
-    <text></text>
-    <x>541</x>
-    <y>709</y>
-    <width>110</width>
-    <height>20</height>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Zlib level:</text>
+    <x>455</x>
+    <y>617</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #179</name>
-    <text>Zlib level</text>
-    <x>465</x>
-    <y>559</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #182</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ZLevel</pv_name>
-    <x>570</x>
-    <y>559</y>
+    <x>560</x>
+    <y>617</y>
     <width>60</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #186</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ZLevel_RBV</pv_name>
-    <x>635</x>
-    <y>560</y>
+    <x>625</x>
+    <y>618</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #190</name>
-    <text>JPEG quality</text>
-    <x>445</x>
-    <y>584</y>
+    <name>Label</name>
+    <text>JPEG quality:</text>
+    <x>435</x>
+    <y>642</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #193</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)JPEGQuality</pv_name>
-    <x>570</x>
-    <y>584</y>
+    <x>560</x>
+    <y>642</y>
     <width>60</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #197</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)JPEGQuality_RBV</pv_name>
-    <x>635</x>
-    <y>585</y>
+    <x>625</x>
+    <y>643</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #201</name>
-    <x>400</x>
-    <y>734</y>
-    <width>641</width>
-    <height>68</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="group" version="2.0.0">
-      <name>composite #204</name>
-      <width>641</width>
-      <height>68</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="textupdate" version="2.0.0">
-        <name>text update #207</name>
-        <pv_name>$(P)$(R)XMLErrorMsg_RBV</pv_name>
-        <width>500</width>
-        <height>18</height>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color red="10" green="0" blue="184">
-          </color>
-        </foreground_color>
-        <background_color>
-          <color red="187" green="187" blue="187">
-          </color>
-        </background_color>
-        <format>6</format>
-        <show_units>false</show_units>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>text update #211</name>
-        <pv_name>$(P)$(R)XMLValid_RBV</pv_name>
-        <x>601</x>
-        <width>40</width>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <background_color>
-          <color red="218" green="218" blue="218">
-          </color>
-        </background_color>
-        <format>1</format>
-        <show_units>false</show_units>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>text #215</name>
-        <text>Exists:</text>
-        <x>526</x>
-        <width>70</width>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <auto_size>true</auto_size>
-      </widget>
-      <widget type="textupdate" version="2.0.0">
-        <name>text update #218</name>
-        <pv_name>$(P)$(R)XMLFileName_RBV</pv_name>
-        <x>135</x>
-        <y>25</y>
-        <width>500</width>
-        <height>18</height>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color red="10" green="0" blue="184">
-          </color>
-        </foreground_color>
-        <background_color>
-          <color red="187" green="187" blue="187">
-          </color>
-        </background_color>
-        <format>6</format>
-        <show_units>false</show_units>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>text #222</name>
-        <text>XML File name</text>
-        <y>48</y>
-        <width>130</width>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <horizontal_alignment>2</horizontal_alignment>
-      </widget>
-      <widget type="textentry" version="3.0.0">
-        <name>text entry #225</name>
-        <pv_name>$(P)$(R)XMLFileName</pv_name>
-        <x>135</x>
-        <y>48</y>
-        <width>500</width>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="16.0">
-          </font>
-        </font>
-        <background_color>
-          <color red="115" green="223" blue="255">
-          </color>
-        </background_color>
-        <format>6</format>
-        <show_units>false</show_units>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-      </widget>
-    </widget>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #229</name>
-    <text>Frames cached per chunk</text>
-    <x>15</x>
-    <y>705</y>
-    <width>230</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Frames cached per chunk:</text>
+    <x>12</x>
+    <y>755</y>
+    <width>210</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #232</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumFramesChunks</pv_name>
-    <x>250</x>
-    <y>705</y>
+    <x>230</x>
+    <y>754</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #236</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumFramesChunks_RBV</pv_name>
-    <x>315</x>
-    <y>706</y>
+    <x>295</x>
+    <y>755</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #240</name>
-    <text>Boundary alignment</text>
-    <x>65</x>
-    <y>730</y>
+    <name>Label</name>
+    <text>Boundary alignment:</text>
+    <x>45</x>
+    <y>779</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #243</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)BoundaryAlign</pv_name>
-    <x>250</x>
-    <y>730</y>
+    <x>230</x>
+    <y>779</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #247</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BoundaryAlign_RBV</pv_name>
-    <x>315</x>
-    <y>731</y>
+    <x>295</x>
+    <y>780</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #251</name>
-    <text>Boundary threshold</text>
-    <x>65</x>
-    <y>755</y>
+    <name>Label</name>
+    <text>Boundary threshold:</text>
+    <x>45</x>
+    <y>804</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #254</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)BoundaryThreshold</pv_name>
-    <x>250</x>
-    <y>755</y>
+    <x>230</x>
+    <y>804</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #258</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BoundaryThreshold_RBV</pv_name>
-    <x>315</x>
-    <y>756</y>
+    <x>295</x>
+    <y>805</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #262</name>
-    <text>Fill value</text>
-    <x>145</x>
-    <y>805</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Fill value:</text>
+    <x>125</x>
+    <y>854</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #265</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FillValue_RBV</pv_name>
-    <x>315</x>
-    <y>806</y>
+    <x>295</x>
+    <y>855</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #269</name>
-    <text>Flush on N'th frame</text>
-    <x>55</x>
-    <y>780</y>
+    <name>Label</name>
+    <text>Flush on N'th frame:</text>
+    <x>35</x>
+    <y>829</y>
     <width>190</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #272</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumFramesFlush</pv_name>
-    <x>250</x>
-    <y>780</y>
+    <x>230</x>
+    <y>829</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #276</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumFramesFlush_RBV</pv_name>
-    <x>315</x>
-    <y>781</y>
+    <x>295</x>
+    <y>830</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #280</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FillValue</pv_name>
-    <x>250</x>
-    <y>805</y>
+    <x>230</x>
+    <y>854</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #284</name>
-    <text>Dim0 chunk size</text>
-    <x>95</x>
-    <y>630</y>
+    <name>Label</name>
+    <text>Dim0 chunk size:</text>
+    <x>75</x>
+    <y>679</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #287</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumColChunks</pv_name>
-    <x>250</x>
-    <y>630</y>
+    <x>230</x>
+    <y>679</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #291</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumColChunks_RBV</pv_name>
-    <x>315</x>
-    <y>631</y>
+    <x>295</x>
+    <y>680</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #295</name>
-    <text>Store attributes</text>
-    <x>405</x>
-    <y>634</y>
+    <name>Label</name>
+    <text>Store attributes:</text>
+    <x>395</x>
+    <y>692</y>
     <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #298</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)StoreAttr</pv_name>
-    <x>570</x>
-    <y>634</y>
+    <x>560</x>
+    <y>692</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #301</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)StoreAttr_RBV</pv_name>
-    <x>635</x>
-    <y>635</y>
+    <x>625</x>
+    <y>693</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #305</name>
-    <text>Chunk size auto</text>
-    <x>95</x>
-    <y>605</y>
+    <name>Label</name>
+    <text>Chunk size auto:</text>
+    <x>75</x>
+    <y>654</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #308</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ChunkSizeAuto</pv_name>
-    <x>250</x>
-    <y>605</y>
+    <x>230</x>
+    <y>654</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #311</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSizeAuto_RBV</pv_name>
-    <x>315</x>
-    <y>606</y>
+    <x>295</x>
+    <y>655</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #315</name>
-    <text>Dim1 chunk size</text>
-    <x>95</x>
-    <y>655</y>
+    <name>Label</name>
+    <text>Dim1 chunk size:</text>
+    <x>75</x>
+    <y>704</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #318</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumRowChunks</pv_name>
-    <x>250</x>
-    <y>655</y>
+    <x>230</x>
+    <y>704</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #322</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumRowChunks_RBV</pv_name>
-    <x>315</x>
-    <y>656</y>
+    <x>295</x>
+    <y>705</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #326</name>
-    <text>Dim2 chunk size</text>
-    <x>95</x>
-    <y>680</y>
+    <name>Label</name>
+    <text>Dim2 chunk size:</text>
+    <x>75</x>
+    <y>729</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #329</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize2</pv_name>
-    <x>250</x>
-    <y>680</y>
+    <x>230</x>
+    <y>729</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #333</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize2_RBV</pv_name>
-    <x>315</x>
-    <y>681</y>
+    <x>295</x>
+    <y>730</y>
     <width>60</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #337</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>NDFileHDF5_ChunkingFull.opi</file>
@@ -1604,13 +2140,210 @@
       </action>
     </actions>
     <text>More</text>
-    <x>20</x>
-    <y>680</y>
+    <x>290</x>
+    <y>885</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>NDPluginBase.opi</file>
+    <x>10</x>
+    <y>65</y>
+    <width>380</width>
+    <height>555</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <x>410</x>
+    <y>618</y>
+    <width>1</width>
+    <height>1</height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>405</x>
+    <y>845</y>
+    <width>641</width>
+    <height>68</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color red="187" green="187" blue="187">
       </color>
     </background_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)XMLErrorMsg_RBV</pv_name>
+      <width>500</width>
+      <height>18</height>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)XMLValid_RBV</pv_name>
+      <x>601</x>
+      <width>40</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color name="OK" red="61" green="216" blue="61">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="218" green="218" blue="218">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Exists:</text>
+      <x>526</x>
+      <width>70</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)XMLFileName_RBV</pv_name>
+      <x>135</x>
+      <y>25</y>
+      <width>500</width>
+      <height>18</height>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>XML File name:</text>
+      <y>48</y>
+      <width>130</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R)XMLFileName</pv_name>
+      <x>135</x>
+      <y>48</y>
+      <width>500</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDFileHDF5_ChunkingFull.bob b/99-Shared/adcore/NDFileHDF5_ChunkingFull.bob
index 12d1c1634a7719be06467d1bdc25c09b4dfda546..15aa1b6f52375f92e6b6f9a42bcf2c9f6ae89821 100644
--- a/99-Shared/adcore/NDFileHDF5_ChunkingFull.bob
+++ b/99-Shared/adcore/NDFileHDF5_ChunkingFull.bob
@@ -4,648 +4,921 @@
   <x>1345</x>
   <y>200</y>
   <width>290</width>
-  <height>345</height>
+  <height>400</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
-  <widget type="label" version="2.0.0">
-    <name>text #6</name>
-    <text>$(P)$(R)</text>
-    <x>-670</x>
-    <y>5</y>
-    <width>1070</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>290</width>
+    <height>350</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #9</name>
-    <y>5</y>
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
     <width>290</width>
-    <height>26</height>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color red="128" green="0" blue="255">
       </color>
     </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1070</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
+    <name>Label</name>
     <text>All chunking</text>
-    <x>85</x>
-    <y>35</y>
+    <x>80</x>
+    <y>70</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #15</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>5</y>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
     <width>290</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #18</name>
-    <text>Dim0 chunk size</text>
-    <x>5</x>
-    <y>90</y>
+    <name>Label</name>
+    <text>Dim0 chunk size:</text>
+    <y>125</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #21</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumColChunks</pv_name>
-    <x>160</x>
-    <y>90</y>
+    <x>155</x>
+    <y>125</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #25</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumColChunks_RBV</pv_name>
-    <x>225</x>
-    <y>91</y>
+    <x>220</x>
+    <y>125</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
-    <text>Chunk size auto</text>
-    <x>5</x>
-    <y>65</y>
+    <name>Label</name>
+    <text>Chunk size auto:</text>
+    <y>100</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #32</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ChunkSizeAuto</pv_name>
-    <x>160</x>
-    <y>65</y>
+    <x>155</x>
+    <y>100</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #35</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSizeAuto_RBV</pv_name>
-    <x>225</x>
-    <y>66</y>
+    <x>220</x>
+    <y>100</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #39</name>
-    <text>Dim1 chunk size</text>
-    <x>5</x>
-    <y>115</y>
+    <name>Label</name>
+    <text>Dim1 chunk size:</text>
+    <y>150</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #42</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumRowChunks</pv_name>
-    <x>160</x>
-    <y>115</y>
+    <x>155</x>
+    <y>150</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #46</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumRowChunks_RBV</pv_name>
-    <x>225</x>
-    <y>116</y>
+    <x>220</x>
+    <y>150</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #50</name>
-    <text>Dim2 chunk size</text>
-    <x>5</x>
-    <y>140</y>
+    <name>Label</name>
+    <text>Dim2 chunk size:</text>
+    <y>175</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #53</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize2</pv_name>
-    <x>160</x>
-    <y>140</y>
+    <x>155</x>
+    <y>175</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #57</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize2_RBV</pv_name>
-    <x>225</x>
-    <y>141</y>
+    <x>220</x>
+    <y>175</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #61</name>
-    <text>Dim3 chunk size</text>
-    <x>5</x>
-    <y>165</y>
+    <name>Label</name>
+    <text>Dim3 chunk size:</text>
+    <y>200</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #64</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize3</pv_name>
-    <x>160</x>
-    <y>165</y>
+    <x>155</x>
+    <y>200</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #68</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize3_RBV</pv_name>
-    <x>225</x>
-    <y>166</y>
+    <x>220</x>
+    <y>200</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #72</name>
-    <text>Dim4 chunk size</text>
-    <x>5</x>
-    <y>190</y>
+    <name>Label</name>
+    <text>Dim4 chunk size:</text>
+    <y>225</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #75</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize4</pv_name>
-    <x>160</x>
-    <y>190</y>
+    <x>155</x>
+    <y>225</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #79</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize4_RBV</pv_name>
-    <x>225</x>
-    <y>191</y>
+    <x>220</x>
+    <y>225</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #83</name>
-    <text>Dim5 chunk size</text>
-    <x>5</x>
-    <y>215</y>
+    <name>Label</name>
+    <text>Dim5 chunk size:</text>
+    <y>250</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #86</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize5</pv_name>
-    <x>160</x>
-    <y>215</y>
+    <x>155</x>
+    <y>250</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #90</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize5_RBV</pv_name>
-    <x>225</x>
-    <y>216</y>
+    <x>220</x>
+    <y>250</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #94</name>
-    <text>Dim6 chunk size</text>
-    <x>5</x>
-    <y>240</y>
+    <name>Label</name>
+    <text>Dim6 chunk size:</text>
+    <y>275</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #97</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize6</pv_name>
-    <x>160</x>
-    <y>240</y>
+    <x>155</x>
+    <y>275</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #101</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize6_RBV</pv_name>
-    <x>225</x>
-    <y>241</y>
+    <x>220</x>
+    <y>275</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #105</name>
-    <text>Dim7 chunk size</text>
-    <x>5</x>
-    <y>265</y>
+    <name>Label</name>
+    <text>Dim7 chunk size:</text>
+    <y>300</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #108</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize7</pv_name>
-    <x>160</x>
-    <y>265</y>
+    <x>155</x>
+    <y>300</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #112</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize7_RBV</pv_name>
-    <x>225</x>
-    <y>266</y>
+    <x>220</x>
+    <y>300</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #116</name>
-    <text>Dim8 chunk size</text>
-    <x>5</x>
-    <y>290</y>
+    <name>Label</name>
+    <text>Dim8 chunk size:</text>
+    <y>325</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #119</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize8</pv_name>
-    <x>160</x>
-    <y>290</y>
+    <x>155</x>
+    <y>325</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #123</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize8_RBV</pv_name>
-    <x>225</x>
-    <y>291</y>
+    <x>220</x>
+    <y>325</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #127</name>
-    <text>Dim8 chunk size</text>
-    <x>5</x>
-    <y>315</y>
+    <name>Label</name>
+    <text>Dim8 chunk size:</text>
+    <y>350</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #130</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ChunkSize9</pv_name>
-    <x>160</x>
-    <y>315</y>
+    <x>155</x>
+    <y>350</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #134</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ChunkSize9_RBV</pv_name>
-    <x>225</x>
-    <y>316</y>
+    <x>220</x>
+    <y>350</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDFileHDF5_ExtraDims.bob b/99-Shared/adcore/NDFileHDF5_ExtraDims.bob
index 3cc0f54142f21b10569f1de985bd5034fc862d69..e9f6c6b9287f0e935a547ff50993fbaadc99af79 100644
--- a/99-Shared/adcore/NDFileHDF5_ExtraDims.bob
+++ b/99-Shared/adcore/NDFileHDF5_ExtraDims.bob
@@ -3,1512 +3,2227 @@
   <name>NDFileHDF5_ExtraDims</name>
   <x>204</x>
   <y>194</y>
-  <width>470</width>
-  <height>625</height>
+  <width>550</width>
+  <height>720</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>470</width>
-    <height>26</height>
+    <name>BGGrey02-background</name>
+    <width>550</width>
+    <height>720</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_2</name>
+    <x>9</x>
+    <y>322</y>
+    <width>530</width>
+    <height>378</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_31</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>9</x>
+    <y>140</y>
+    <width>530</width>
+    <height>170</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02</name>
+    <x>9</x>
+    <y>60</y>
+    <width>530</width>
+    <height>70</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_26</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>550</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>470</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>530</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
-    <text>Extra dimensions</text>
-    <x>155</x>
-    <y>35</y>
-    <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Extra dimensions:</text>
+    <x>30</x>
+    <y>70</y>
+    <width>193</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #15</name>
-    <text>Size N</text>
-    <x>15</x>
-    <y>120</y>
+    <name>Label</name>
+    <text>Size N:</text>
+    <x>19</x>
+    <y>150</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #18</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSizeN</pv_name>
-    <x>80</x>
-    <y>120</y>
+    <x>84</x>
+    <y>150</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #22</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSizeN_RBV</pv_name>
-    <x>145</x>
-    <y>121</y>
+    <x>154</x>
+    <y>151</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
-    <text>Name N</text>
-    <x>15</x>
-    <y>145</y>
+    <name>Label</name>
+    <text>Name N:</text>
+    <x>19</x>
+    <y>175</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #29</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimNameN_RBV</pv_name>
-    <x>80</x>
-    <y>146</y>
+    <x>84</x>
+    <y>176</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #33</name>
-    <text>Size X</text>
-    <x>15</x>
-    <y>170</y>
+    <name>Label</name>
+    <text>Size X:</text>
+    <x>19</x>
+    <y>200</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #36</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSizeX</pv_name>
-    <x>80</x>
-    <y>170</y>
+    <x>84</x>
+    <y>200</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #40</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSizeX_RBV</pv_name>
-    <x>145</x>
-    <y>171</y>
+    <x>154</x>
+    <y>201</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #44</name>
-    <text>Name X</text>
-    <x>15</x>
-    <y>195</y>
+    <name>Label</name>
+    <text>Name X:</text>
+    <x>19</x>
+    <y>225</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #47</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimNameX_RBV</pv_name>
-    <x>80</x>
-    <y>196</y>
+    <x>84</x>
+    <y>226</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #51</name>
-    <text>Size Y</text>
-    <x>15</x>
-    <y>220</y>
+    <name>Label</name>
+    <text>Size Y:</text>
+    <x>19</x>
+    <y>250</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #54</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSizeY</pv_name>
-    <x>80</x>
-    <y>220</y>
+    <x>84</x>
+    <y>250</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #58</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSizeY_RBV</pv_name>
-    <x>145</x>
-    <y>221</y>
+    <x>154</x>
+    <y>251</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #62</name>
-    <text>Name Y</text>
-    <x>15</x>
-    <y>245</y>
+    <name>Label</name>
+    <text>Name Y:</text>
+    <x>19</x>
+    <y>275</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #65</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimNameY_RBV</pv_name>
-    <x>80</x>
-    <y>246</y>
+    <x>84</x>
+    <y>276</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #69</name>
-    <text>Size 3</text>
-    <x>15</x>
-    <y>270</y>
+    <name>Label</name>
+    <text>Size 3:</text>
+    <x>19</x>
+    <y>341</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #72</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize3</pv_name>
-    <x>80</x>
-    <y>270</y>
+    <x>84</x>
+    <y>341</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #76</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize3_RBV</pv_name>
-    <x>145</x>
-    <y>271</y>
+    <x>154</x>
+    <y>340</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #80</name>
-    <text>Name 3</text>
-    <x>15</x>
-    <y>295</y>
+    <name>Label</name>
+    <text>Name 3:</text>
+    <x>19</x>
+    <y>364</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #83</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName3_RBV</pv_name>
-    <x>80</x>
-    <y>296</y>
+    <x>84</x>
+    <y>365</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #87</name>
-    <text>Size 4</text>
-    <x>15</x>
-    <y>320</y>
+    <name>Label</name>
+    <text>Size 4:</text>
+    <x>19</x>
+    <y>389</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #90</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize4</pv_name>
-    <x>80</x>
-    <y>320</y>
+    <x>84</x>
+    <y>389</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #94</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize4_RBV</pv_name>
-    <x>145</x>
-    <y>321</y>
+    <x>153</x>
+    <y>390</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #98</name>
-    <text>Name 4</text>
-    <x>15</x>
-    <y>345</y>
+    <name>Label</name>
+    <text>Name 4:</text>
+    <x>19</x>
+    <y>414</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #101</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName4_RBV</pv_name>
-    <x>80</x>
-    <y>346</y>
+    <x>84</x>
+    <y>415</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #105</name>
-    <text>Size 5</text>
-    <x>15</x>
-    <y>370</y>
+    <name>Label</name>
+    <text>Size 5:</text>
+    <x>19</x>
+    <y>439</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #108</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize5</pv_name>
-    <x>80</x>
-    <y>370</y>
+    <x>84</x>
+    <y>439</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #112</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize5_RBV</pv_name>
-    <x>145</x>
-    <y>371</y>
+    <x>154</x>
+    <y>440</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #116</name>
-    <text>Name 5</text>
-    <x>15</x>
-    <y>395</y>
+    <name>Label</name>
+    <text>Name 5:</text>
+    <x>19</x>
+    <y>464</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #119</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName5_RBV</pv_name>
-    <x>80</x>
-    <y>396</y>
+    <x>84</x>
+    <y>465</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #123</name>
-    <text>Size 6</text>
-    <x>15</x>
-    <y>420</y>
+    <name>Label</name>
+    <text>Size 6:</text>
+    <x>19</x>
+    <y>489</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #126</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize6</pv_name>
-    <x>80</x>
-    <y>420</y>
+    <x>84</x>
+    <y>489</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #130</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize6_RBV</pv_name>
-    <x>145</x>
-    <y>421</y>
+    <x>154</x>
+    <y>490</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #134</name>
-    <text>Name 6</text>
-    <x>15</x>
-    <y>445</y>
+    <name>Label</name>
+    <text>Name 6:</text>
+    <x>19</x>
+    <y>514</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #137</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName6_RBV</pv_name>
-    <x>80</x>
-    <y>446</y>
+    <x>84</x>
+    <y>515</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #141</name>
-    <text>Size 7</text>
-    <x>15</x>
-    <y>470</y>
+    <name>Label</name>
+    <text>Size 7:</text>
+    <x>19</x>
+    <y>539</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #144</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize7</pv_name>
-    <x>80</x>
-    <y>470</y>
+    <x>84</x>
+    <y>539</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #148</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize7_RBV</pv_name>
-    <x>145</x>
-    <y>471</y>
+    <x>154</x>
+    <y>540</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #152</name>
-    <text>Name 7</text>
-    <x>15</x>
-    <y>495</y>
+    <name>Label</name>
+    <text>Name 7:</text>
+    <x>19</x>
+    <y>564</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #155</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName7_RBV</pv_name>
-    <x>80</x>
-    <y>496</y>
+    <x>84</x>
+    <y>565</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #159</name>
-    <text>Size 8</text>
-    <x>15</x>
-    <y>520</y>
+    <name>Label</name>
+    <text>Size 8:</text>
+    <x>19</x>
+    <y>589</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #162</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize8</pv_name>
-    <x>80</x>
-    <y>520</y>
+    <x>84</x>
+    <y>589</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #166</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize8_RBV</pv_name>
-    <x>145</x>
-    <y>521</y>
+    <x>155</x>
+    <y>590</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #170</name>
-    <text>Name 8</text>
-    <x>15</x>
-    <y>545</y>
+    <name>Label</name>
+    <text>Name 8:</text>
+    <x>19</x>
+    <y>614</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #173</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName8_RBV</pv_name>
-    <x>80</x>
-    <y>546</y>
+    <x>84</x>
+    <y>615</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #177</name>
-    <text>Size 9</text>
-    <x>15</x>
-    <y>570</y>
+    <name>Label</name>
+    <text>Size 9:</text>
+    <x>19</x>
+    <y>639</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #180</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimSize9</pv_name>
-    <x>80</x>
-    <y>570</y>
+    <x>84</x>
+    <y>639</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #184</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimSize9_RBV</pv_name>
-    <x>145</x>
-    <y>571</y>
+    <x>153</x>
+    <y>640</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #188</name>
-    <text>Name 9</text>
-    <x>15</x>
-    <y>595</y>
+    <name>Label</name>
+    <text>Name 9:</text>
+    <x>19</x>
+    <y>664</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #191</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimName9_RBV</pv_name>
-    <x>80</x>
-    <y>596</y>
+    <x>84</x>
+    <y>665</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #195</name>
-    <text>Chunk X</text>
-    <x>240</x>
-    <y>170</y>
+    <name>Label</name>
+    <text>Chunk X:</text>
+    <x>296</x>
+    <y>151</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #198</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunkX</pv_name>
-    <x>315</x>
-    <y>170</y>
+    <x>371</x>
+    <y>151</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #202</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunkX_RBV</pv_name>
-    <x>380</x>
-    <y>171</y>
+    <x>436</x>
+    <y>152</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #206</name>
-    <text>Chunk Y</text>
-    <x>240</x>
-    <y>220</y>
+    <name>Label</name>
+    <text>Chunk Y:</text>
+    <x>296</x>
+    <y>201</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #209</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunkY</pv_name>
-    <x>315</x>
-    <y>220</y>
+    <x>371</x>
+    <y>201</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #213</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunkY_RBV</pv_name>
-    <x>380</x>
-    <y>221</y>
+    <x>436</x>
+    <y>202</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #217</name>
-    <text>Chunk 3</text>
-    <x>240</x>
-    <y>270</y>
+    <name>Label</name>
+    <text>Chunk 3:</text>
+    <x>296</x>
+    <y>340</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #220</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk3</pv_name>
-    <x>315</x>
-    <y>270</y>
+    <x>371</x>
+    <y>340</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #224</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk3_RBV</pv_name>
-    <x>380</x>
-    <y>271</y>
+    <x>436</x>
+    <y>341</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #228</name>
-    <text>Chunk 3</text>
-    <x>240</x>
-    <y>320</y>
+    <name>Label</name>
+    <text>Chunk 4:</text>
+    <x>296</x>
+    <y>390</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #231</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk4</pv_name>
-    <x>315</x>
-    <y>320</y>
+    <x>371</x>
+    <y>390</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #235</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk4_RBV</pv_name>
-    <x>380</x>
-    <y>321</y>
+    <x>436</x>
+    <y>391</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #239</name>
-    <text>Chunk 5</text>
-    <x>240</x>
-    <y>370</y>
+    <name>Label</name>
+    <text>Chunk 5:</text>
+    <x>296</x>
+    <y>440</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #242</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk5</pv_name>
-    <x>315</x>
-    <y>370</y>
+    <x>371</x>
+    <y>440</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #246</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk5_RBV</pv_name>
-    <x>380</x>
-    <y>371</y>
+    <x>436</x>
+    <y>441</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #250</name>
-    <text>Chunk 6</text>
-    <x>240</x>
-    <y>420</y>
+    <name>Label</name>
+    <text>Chunk 6:</text>
+    <x>296</x>
+    <y>490</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #253</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk6</pv_name>
-    <x>315</x>
-    <y>420</y>
+    <x>371</x>
+    <y>490</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #257</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk6_RBV</pv_name>
-    <x>380</x>
-    <y>421</y>
+    <x>436</x>
+    <y>491</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #261</name>
-    <text>Chunk 7</text>
-    <x>240</x>
-    <y>470</y>
+    <name>Label</name>
+    <text>Chunk 7:</text>
+    <x>296</x>
+    <y>540</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #264</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk7</pv_name>
-    <x>315</x>
-    <y>470</y>
+    <x>371</x>
+    <y>540</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #268</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk7_RBV</pv_name>
-    <x>380</x>
-    <y>471</y>
+    <x>436</x>
+    <y>541</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #272</name>
-    <text>Chunk 8</text>
-    <x>240</x>
-    <y>520</y>
+    <name>Label</name>
+    <text>Chunk 8:</text>
+    <x>296</x>
+    <y>590</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #275</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk8</pv_name>
-    <x>315</x>
-    <y>520</y>
+    <x>371</x>
+    <y>590</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #279</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk8_RBV</pv_name>
-    <x>380</x>
-    <y>521</y>
+    <x>436</x>
+    <y>591</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #283</name>
-    <text>Chunk 9</text>
-    <x>240</x>
-    <y>570</y>
+    <name>Label</name>
+    <text>Chunk 9:</text>
+    <x>296</x>
+    <y>640</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #286</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)ExtraDimChunk9</pv_name>
-    <x>315</x>
-    <y>570</y>
+    <x>371</x>
+    <y>640</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #290</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExtraDimChunk9_RBV</pv_name>
-    <x>380</x>
-    <y>571</y>
+    <x>436</x>
+    <y>641</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #294</name>
-    <text>Dimension attribute datasets</text>
-    <x>5</x>
-    <y>90</y>
-    <width>280</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Dimension attribute datasets:</text>
+    <x>19</x>
+    <y>94</y>
+    <width>204</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #297</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)DimAttDatasets</pv_name>
-    <x>290</x>
-    <y>89</y>
+    <x>296</x>
+    <y>94</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #300</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DimAttDatasets_RBV</pv_name>
-    <x>355</x>
-    <y>91</y>
+    <x>361</x>
+    <y>96</y>
     <width>80</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #304</name>
+    <name>Label</name>
     <text># (0-9)</text>
-    <x>215</x>
-    <y>65</y>
+    <x>209</x>
+    <y>70</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #307</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumExtraDims</pv_name>
-    <x>290</x>
-    <y>65</y>
+    <x>296</x>
+    <y>70</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #311</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumExtraDims_RBV</pv_name>
-    <x>355</x>
-    <y>66</y>
+    <x>361</x>
+    <y>71</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDFileHDF5_Positions.bob b/99-Shared/adcore/NDFileHDF5_Positions.bob
index 350e6f1210257b8e7f34a80cef235873277608fe..6747e5dcda676552fad290a93b692d607e1fde67 100644
--- a/99-Shared/adcore/NDFileHDF5_Positions.bob
+++ b/99-Shared/adcore/NDFileHDF5_Positions.bob
@@ -4,1160 +4,1651 @@
   <x>128</x>
   <y>128</y>
   <width>460</width>
+  <height>650</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>460</width>
-    <height>26</height>
+    <name>BGGrey02-background_2</name>
+    <y>40</y>
+    <width>480</width>
+    <height>610</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>480</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>6</y>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
     <width>460</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
+    <name>Label</name>
     <text>Positions</text>
     <x>190</x>
-    <y>35</y>
+    <y>60</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #15</name>
+    <name>Label</name>
     <text>Position mode</text>
-    <x>90</x>
-    <y>65</y>
+    <x>95</x>
+    <y>90</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #18</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PositionMode_RBV</pv_name>
-    <x>290</x>
-    <y>66</y>
+    <x>295</x>
+    <y>91</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #22</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)PositionMode</pv_name>
-    <x>225</x>
-    <y>65</y>
+    <x>230</x>
+    <y>90</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #25</name>
-    <text>Index N</text>
-    <x>5</x>
-    <y>95</y>
+    <name>Label</name>
+    <text>Index N:</text>
+    <x>11</x>
+    <y>120</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #28</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDimN</pv_name>
-    <x>80</x>
-    <y>95</y>
+    <x>85</x>
+    <y>120</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #32</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDimN_RBV</pv_name>
-    <x>265</x>
-    <y>96</y>
+    <x>270</x>
+    <y>121</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #36</name>
-    <text>Name N</text>
-    <x>15</x>
-    <y>120</y>
+    <name>Label</name>
+    <text>Name N:</text>
+    <x>20</x>
+    <y>145</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #39</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDimN_RBV</pv_name>
-    <x>265</x>
-    <y>121</y>
+    <x>270</x>
+    <y>146</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #43</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDimN</pv_name>
-    <x>80</x>
-    <y>120</y>
+    <x>85</x>
+    <y>145</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #47</name>
-    <text>Index X</text>
-    <x>5</x>
-    <y>145</y>
+    <name>Label</name>
+    <text>Index X:</text>
+    <x>10</x>
+    <y>170</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #50</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDimX</pv_name>
-    <x>80</x>
-    <y>145</y>
+    <x>85</x>
+    <y>170</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #54</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDimX_RBV</pv_name>
-    <x>265</x>
-    <y>146</y>
+    <x>270</x>
+    <y>171</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #58</name>
-    <text>Name X</text>
-    <x>15</x>
-    <y>170</y>
+    <name>Label</name>
+    <text>Name X:</text>
+    <x>20</x>
+    <y>195</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #61</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDimX_RBV</pv_name>
-    <x>265</x>
-    <y>171</y>
+    <x>270</x>
+    <y>196</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #65</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDimX</pv_name>
-    <x>80</x>
-    <y>170</y>
+    <x>85</x>
+    <y>195</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #69</name>
-    <text>Index Y</text>
-    <x>5</x>
-    <y>195</y>
+    <name>Label</name>
+    <text>Index Y:</text>
+    <x>10</x>
+    <y>220</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #72</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDimY</pv_name>
-    <x>80</x>
-    <y>195</y>
+    <x>85</x>
+    <y>220</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #76</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDimY_RBV</pv_name>
-    <x>265</x>
-    <y>196</y>
+    <x>270</x>
+    <y>221</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #80</name>
-    <text>Name Y</text>
-    <x>15</x>
-    <y>220</y>
+    <name>Label</name>
+    <text>Name Y:</text>
+    <x>20</x>
+    <y>245</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #83</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDimY_RBV</pv_name>
-    <x>265</x>
-    <y>221</y>
+    <x>270</x>
+    <y>246</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #87</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDimY</pv_name>
-    <x>80</x>
-    <y>220</y>
+    <x>85</x>
+    <y>245</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #91</name>
-    <text>Index 3</text>
-    <x>5</x>
-    <y>245</y>
+    <name>Label</name>
+    <text>Index 3:</text>
+    <x>10</x>
+    <y>270</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #94</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim3</pv_name>
-    <x>80</x>
-    <y>245</y>
+    <x>85</x>
+    <y>270</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #98</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim3_RBV</pv_name>
-    <x>265</x>
-    <y>246</y>
+    <x>270</x>
+    <y>271</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #102</name>
-    <text>Name 3</text>
-    <x>15</x>
-    <y>270</y>
+    <name>Label</name>
+    <text>Name 3:</text>
+    <x>20</x>
+    <y>295</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #105</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim3_RBV</pv_name>
-    <x>265</x>
-    <y>271</y>
+    <x>270</x>
+    <y>296</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #109</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim3</pv_name>
-    <x>80</x>
-    <y>270</y>
+    <x>85</x>
+    <y>295</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #113</name>
-    <text>Index 4</text>
-    <x>5</x>
-    <y>295</y>
+    <name>Label</name>
+    <text>Index 4:</text>
+    <x>10</x>
+    <y>320</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #116</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim4</pv_name>
-    <x>80</x>
-    <y>295</y>
+    <x>85</x>
+    <y>320</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #120</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim4_RBV</pv_name>
-    <x>265</x>
-    <y>296</y>
+    <x>270</x>
+    <y>321</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #124</name>
-    <text>Name 4</text>
-    <x>15</x>
-    <y>320</y>
+    <name>Label</name>
+    <text>Name 4:</text>
+    <x>20</x>
+    <y>345</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #127</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim4_RBV</pv_name>
-    <x>265</x>
-    <y>321</y>
+    <x>270</x>
+    <y>346</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #131</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim4</pv_name>
-    <x>80</x>
-    <y>320</y>
+    <x>85</x>
+    <y>345</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #135</name>
-    <text>Index 5</text>
-    <x>5</x>
-    <y>345</y>
+    <name>Label</name>
+    <text>Index 5:</text>
+    <x>10</x>
+    <y>370</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #138</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim5</pv_name>
-    <x>80</x>
-    <y>345</y>
+    <x>85</x>
+    <y>370</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #142</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim5_RBV</pv_name>
-    <x>265</x>
-    <y>346</y>
+    <x>270</x>
+    <y>371</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #146</name>
-    <text>Name 5</text>
-    <x>15</x>
-    <y>370</y>
+    <name>Label</name>
+    <text>Name 5:</text>
+    <x>20</x>
+    <y>395</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #149</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim5_RBV</pv_name>
-    <x>265</x>
-    <y>371</y>
+    <x>270</x>
+    <y>396</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #153</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim5</pv_name>
-    <x>80</x>
-    <y>370</y>
+    <x>85</x>
+    <y>395</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #157</name>
-    <text>Index 6</text>
-    <x>5</x>
-    <y>395</y>
+    <name>Label</name>
+    <text>Index 6:</text>
+    <x>10</x>
+    <y>420</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #160</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim6</pv_name>
-    <x>80</x>
-    <y>395</y>
+    <x>85</x>
+    <y>420</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #164</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim6_RBV</pv_name>
-    <x>265</x>
-    <y>396</y>
+    <x>270</x>
+    <y>421</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #168</name>
-    <text>Name 6</text>
-    <x>15</x>
-    <y>420</y>
+    <name>Label</name>
+    <text>Name 6:</text>
+    <x>20</x>
+    <y>445</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #171</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim6_RBV</pv_name>
-    <x>265</x>
-    <y>421</y>
+    <x>270</x>
+    <y>446</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #175</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim6</pv_name>
-    <x>80</x>
-    <y>420</y>
+    <x>85</x>
+    <y>445</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #179</name>
-    <text>Index 7</text>
-    <x>5</x>
-    <y>445</y>
+    <name>Label</name>
+    <text>Index 7:</text>
+    <x>10</x>
+    <y>470</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #182</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim7</pv_name>
-    <x>80</x>
-    <y>445</y>
+    <x>85</x>
+    <y>470</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #186</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim7_RBV</pv_name>
-    <x>265</x>
-    <y>446</y>
+    <x>270</x>
+    <y>471</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #190</name>
-    <text>Name 7</text>
-    <x>15</x>
-    <y>470</y>
+    <name>Label</name>
+    <text>Name 7:</text>
+    <x>20</x>
+    <y>495</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #193</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim7_RBV</pv_name>
-    <x>265</x>
-    <y>471</y>
+    <x>270</x>
+    <y>496</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #197</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim7</pv_name>
-    <x>80</x>
-    <y>470</y>
+    <x>85</x>
+    <y>495</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #201</name>
-    <text>Index 8</text>
-    <x>5</x>
-    <y>495</y>
+    <name>Label</name>
+    <text>Index 8:</text>
+    <x>10</x>
+    <y>520</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #204</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim8</pv_name>
-    <x>80</x>
-    <y>495</y>
+    <x>85</x>
+    <y>520</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #208</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim8_RBV</pv_name>
-    <x>265</x>
-    <y>496</y>
+    <x>270</x>
+    <y>521</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #212</name>
-    <text>Name 8</text>
-    <x>15</x>
-    <y>520</y>
+    <name>Label</name>
+    <text>Name 8:</text>
+    <x>20</x>
+    <y>545</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #215</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim8_RBV</pv_name>
-    <x>265</x>
-    <y>521</y>
+    <x>270</x>
+    <y>546</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #219</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim8</pv_name>
-    <x>80</x>
-    <y>520</y>
+    <x>85</x>
+    <y>545</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #223</name>
-    <text>Index 9</text>
-    <x>5</x>
-    <y>545</y>
+    <name>Label</name>
+    <text>Index 9:</text>
+    <x>10</x>
+    <y>570</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #226</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosIndexDim9</pv_name>
-    <x>80</x>
-    <y>545</y>
+    <x>85</x>
+    <y>570</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #230</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosIndexDim9_RBV</pv_name>
-    <x>265</x>
-    <y>546</y>
+    <x>270</x>
+    <y>571</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #234</name>
-    <text>Name 9</text>
-    <x>15</x>
-    <y>570</y>
+    <name>Label</name>
+    <text>Name 9:</text>
+    <x>20</x>
+    <y>595</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #237</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PosNameDim9_RBV</pv_name>
-    <x>265</x>
-    <y>571</y>
+    <x>270</x>
+    <y>596</y>
     <width>180</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #241</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)PosNameDim9</pv_name>
-    <x>80</x>
-    <y>570</y>
+    <x>85</x>
+    <y>595</y>
     <width>180</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDPlot.bob b/99-Shared/adcore/NDPlot.bob
index 1276a58a6b9498346d7d23f33a85ae89a71fd4ad..ad93d6a8735b87152c818a1c8f575c3bd4da64f2 100644
--- a/99-Shared/adcore/NDPlot.bob
+++ b/99-Shared/adcore/NDPlot.bob
@@ -3,32 +3,64 @@
   <name>NDPlot</name>
   <x>1095</x>
   <y>344</y>
-  <width>400</width>
-  <height>300</height>
+  <width>470</width>
+  <height>380</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>470</width>
+    <height>330</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
   <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #6</name>
-    <y>30</y>
+    <name>XY Graph</name>
+    <x>30</x>
+    <y>70</y>
     <height>270</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
     <title>$(TITLE)</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
     <x_axis>
       <title>$(XLABEL)</title>
       <autoscale>true</autoscale>
       <log_scale>false</log_scale>
       <minimum>0.0</minimum>
       <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      <show_grid>true</show_grid>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
       <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
         </font>
       </scale_font>
       <visible>true</visible>
@@ -40,13 +72,13 @@
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -67,38 +99,43 @@
         <line_width>1</line_width>
         <line_style>0</line_style>
         <point_type>0</point_type>
-        <point_size>10</point_size>
+        <point_size>4</point_size>
         <visible>true</visible>
       </trace>
     </traces>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #10</name>
-    <width>400</width>
-    <height>26</height>
-    <line_color>
-      <color red="218" green="218" blue="218">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="218" green="218" blue="218">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>470</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #13</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R) $(TITLE)</text>
-    <y>1</y>
-    <width>400</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>450</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDPlotXY.bob b/99-Shared/adcore/NDPlotXY.bob
index e314b7cef7d253177e00c0e75e4592aca44fcfb0..5b8fa214a92627d674c35530a368ddadbdbb9c5e 100644
--- a/99-Shared/adcore/NDPlotXY.bob
+++ b/99-Shared/adcore/NDPlotXY.bob
@@ -3,32 +3,64 @@
   <name>NDPlotXY</name>
   <x>1095</x>
   <y>344</y>
-  <width>400</width>
-  <height>300</height>
+  <width>470</width>
+  <height>380</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>470</width>
+    <height>330</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
   <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #6</name>
-    <y>30</y>
+    <name>XY Graph</name>
+    <x>30</x>
+    <y>70</y>
     <height>270</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
     <title>$(TITLE)</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
     <x_axis>
       <title>$(XLABEL)</title>
       <autoscale>true</autoscale>
       <log_scale>false</log_scale>
       <minimum>0.0</minimum>
       <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      <show_grid>true</show_grid>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
       <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
         </font>
       </scale_font>
       <visible>true</visible>
@@ -40,13 +72,13 @@
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -67,38 +99,43 @@
         <line_width>1</line_width>
         <line_style>0</line_style>
         <point_type>0</point_type>
-        <point_size>10</point_size>
+        <point_size>4</point_size>
         <visible>true</visible>
       </trace>
     </traces>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #10</name>
-    <width>400</width>
-    <height>26</height>
-    <line_color>
-      <color red="218" green="218" blue="218">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="218" green="218" blue="218">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>470</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #13</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R) $(TITLE)</text>
-    <y>1</y>
-    <width>400</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>450</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
-</display>
+</display>
\ No newline at end of file
diff --git a/99-Shared/adcore/NDPluginBase.bob b/99-Shared/adcore/NDPluginBase.bob
index 4778dfa230eb83835a7ef56fb4c8400bbaa17b1e..a58471f3d80aaaa331650f3d05d484ae824e1eca 100644
--- a/99-Shared/adcore/NDPluginBase.bob
+++ b/99-Shared/adcore/NDPluginBase.bob
@@ -6,739 +6,1031 @@
   <width>380</width>
   <height>555</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
+    <name>BGGrey02-background</name>
     <width>380</width>
     <height>555</height>
-    <line_width>1</line_width>
+    <line_width>2</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <width>380</width>
+    <height>555</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </line_color>
     <transparent>true</transparent>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #9</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PortName_RBV</pv_name>
     <x>167</x>
     <y>5</y>
     <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #13</name>
-    <text>asyn port</text>
+    <name>Label</name>
+    <text>asyn port:</text>
     <x>67</x>
     <y>4</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
-    <text>Plugin type</text>
+    <name>Label</name>
+    <text>Plugin type:</text>
     <x>47</x>
     <y>29</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #19</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PluginType_RBV</pv_name>
     <x>167</x>
     <y>30</y>
     <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #23</name>
-    <text>ADCore version</text>
+    <name>Label</name>
+    <text>ADCore version:</text>
     <x>17</x>
     <y>54</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #26</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ADCoreVersion_RBV</pv_name>
     <x>167</x>
     <y>55</y>
     <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #30</name>
-    <text>Plugin version</text>
+    <name>Label</name>
+    <text>Plugin version:</text>
     <x>17</x>
     <y>78</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #33</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DriverVersion_RBV</pv_name>
     <x>167</x>
     <y>79</y>
     <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #37</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDArrayAddress</pv_name>
     <x>167</x>
     <y>129</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #41</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDArrayAddress_RBV</pv_name>
     <x>273</x>
     <y>130</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
-    <text>Array address</text>
+    <name>Label</name>
+    <text>Array address:</text>
     <x>27</x>
     <y>129</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
-    <text>Array port</text>
+    <name>Label</name>
+    <text>Array port:</text>
     <x>57</x>
     <y>104</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #51</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDArrayPort</pv_name>
     <x>167</x>
     <y>104</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #55</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDArrayPort_RBV</pv_name>
     <x>273</x>
     <y>105</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #59</name>
-    <text>Min. time</text>
+    <name>Label</name>
+    <text>Min. time:</text>
     <x>67</x>
     <y>179</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #62</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MinCallbackTime</pv_name>
     <x>167</x>
     <y>179</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #66</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MinCallbackTime_RBV</pv_name>
     <x>273</x>
     <y>180</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #70</name>
-    <text>Enable</text>
+    <name>Label</name>
+    <text>Enable:</text>
     <x>97</x>
     <y>154</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #73</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableCallbacks</pv_name>
     <x>167</x>
     <y>154</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #76</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
     <x>273</x>
     <y>155</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #80</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DroppedArrays_RBV</pv_name>
     <x>273</x>
     <y>305</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #84</name>
-    <text>Dropped arrays</text>
+    <name>Label</name>
+    <text>Dropped arrays:</text>
     <x>17</x>
     <y>304</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #87</name>
-    <text>Array Size</text>
+    <name>Label</name>
+    <text>Array Size:</text>
     <x>57</x>
     <y>354</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #90</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
     <x>167</x>
     <y>355</y>
     <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #94</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize1_RBV</pv_name>
     <x>237</x>
     <y>355</y>
     <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #98</name>
-    <text>Data type</text>
+    <name>Label</name>
+    <text>Data type:</text>
     <x>67</x>
     <y>379</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #101</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DataType_RBV</pv_name>
     <x>167</x>
     <y>380</y>
     <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #105</name>
-    <text># dimensions</text>
+    <name>Label</name>
+    <text># dimensions:</text>
     <x>37</x>
     <y>329</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #108</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDimensions_RBV</pv_name>
     <x>167</x>
     <y>330</y>
     <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #112</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize2_RBV</pv_name>
     <x>307</x>
     <y>355</y>
     <width>65</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #116</name>
-    <text>Color mode</text>
+    <name>Label</name>
+    <text>Color mode:</text>
     <x>57</x>
     <y>404</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #119</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ColorMode_RBV</pv_name>
     <x>167</x>
     <y>405</y>
     <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #123</name>
-    <text>Execution time</text>
+    <name>Label</name>
+    <text>Execution time:</text>
     <x>17</x>
     <y>279</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #126</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExecutionTime_RBV</pv_name>
     <x>167</x>
     <y>280</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #130</name>
+    <name>Label</name>
     <text>msec</text>
     <x>273</x>
     <y>279</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #133</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
     <x>273</x>
     <y>230</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #137</name>
-    <text>Array counter</text>
+    <name>Label</name>
+    <text>Array counter:</text>
     <x>27</x>
     <y>229</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #140</name>
-    <text>Array rate</text>
+    <name>Label</name>
+    <text>Array rate:</text>
     <x>57</x>
     <y>254</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #143</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
     <x>167</x>
     <y>255</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #147</name>
-    <text>Unique ID</text>
+    <name>Label</name>
+    <text>Unique ID:</text>
     <x>67</x>
     <y>429</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #150</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)UniqueId_RBV</pv_name>
     <x>167</x>
     <y>430</y>
     <width>79</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #154</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)ArrayCounter</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)ArrayCounter</pv_name>
@@ -746,18 +1038,21 @@
     <x>167</x>
     <y>229</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #157</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)DroppedArrays</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)DroppedArrays</pv_name>
@@ -765,109 +1060,161 @@
     <x>167</x>
     <y>304</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #160</name>
-    <text>Queue size/free</text>
+    <name>Label</name>
+    <text>Queue size/free:</text>
     <x>7</x>
     <y>204</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #163</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)QueueFree</pv_name>
     <x>273</x>
     <y>204</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #167</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)QueueSize</pv_name>
     <x>167</x>
     <y>204</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #171</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TimeStamp_RBV</pv_name>
     <x>167</x>
     <y>455</y>
     <width>150</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #175</name>
-    <text>Time stamp</text>
+    <name>Label</name>
+    <text>Time stamp:</text>
     <x>57</x>
     <y>454</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #178</name>
-    <text>Array callbacks</text>
+    <name>Label</name>
+    <text>Array callbacks:</text>
     <x>7</x>
     <y>479</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #181</name>
+    <name>Menu Button</name>
     <actions>
       <action type="open_display">
         <file>NDPluginBaseFull.opi</file>
@@ -875,7 +1222,7 @@
         <description>NDPluginBase Full</description>
       </action>
       <action type="open_display">
-        <file>asynRecord.opi</file>
+        <file>../asyn/asynRecord.opi</file>
         <macros>
           <R>$(R)AsynIO</R>
         </macros>
@@ -883,79 +1230,115 @@
         <description>asynRecord</description>
       </action>
     </actions>
-    <text></text>
+    <text>Menu Button Label</text>
     <x>167</x>
     <y>529</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #185</name>
-    <text>More</text>
+    <name>Label</name>
+    <text>More:</text>
     <x>117</x>
     <y>529</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #188</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ArrayCallbacks</pv_name>
     <x>167</x>
     <y>479</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #191</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayCallbacks_RBV</pv_name>
     <x>273</x>
     <y>480</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #195</name>
-    <text>Process plugin</text>
+    <name>Label</name>
+    <text>Process plugin:</text>
     <x>17</x>
     <y>504</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #198</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)ProcessPlugin</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)ProcessPlugin</pv_name>
@@ -963,8 +1346,12 @@
     <x>167</x>
     <y>504</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
diff --git a/99-Shared/adcore/NDPluginBaseFull.bob b/99-Shared/adcore/NDPluginBaseFull.bob
index c2685685a7f56b0b3afc475e79d06a80245e5be4..99b76a1f2c5a29613085dd8ebfc84d0a63b54b5a 100644
--- a/99-Shared/adcore/NDPluginBaseFull.bob
+++ b/99-Shared/adcore/NDPluginBaseFull.bob
@@ -3,1616 +3,2337 @@
   <name>NDPluginBaseFull</name>
   <x>399</x>
   <y>92</y>
-  <width>775</width>
-  <height>565</height>
+  <width>820</width>
+  <height>650</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <width>775</width>
-    <height>26</height>
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>820</width>
+    <height>600</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_2</name>
+    <x>416</x>
+    <y>70</y>
+    <width>379</width>
+    <height>379</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_33</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Linking Container</name>
+      <file>ADAttrFile.opi</file>
+      <x>16</x>
+      <y>415</y>
+      <width>350</width>
+      <height>120</height>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>20</x>
+    <y>70</y>
+    <width>379</width>
+    <height>560</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>820</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>50</x>
+    <y>580</y>
+    <width>220</width>
+    <height>20</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="187" green="187" blue="187">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="open_display">
+          <file>../asyn/asynRecord.opi</file>
+          <macros>
+            <R>$(R)AsynIO</R>
+          </macros>
+          <target>tab</target>
+          <description>asynRecord</description>
+        </action>
+      </actions>
+      <text></text>
+      <x>120</x>
+      <height>20</height>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>asyn record:</text>
+      <width>110</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <width>775</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>820</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #12</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PortName_RBV</pv_name>
     <x>170</x>
-    <y>36</y>
+    <y>81</y>
     <width>160</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
-    <text>asyn port</text>
+    <name>Label</name>
+    <text>asyn port:</text>
     <x>70</x>
-    <y>35</y>
+    <y>80</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #19</name>
-    <text>Plugin type</text>
+    <name>Label</name>
+    <text>Plugin type:</text>
     <x>50</x>
-    <y>60</y>
+    <y>105</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #22</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)PluginType_RBV</pv_name>
     <x>170</x>
-    <y>61</y>
+    <y>106</y>
     <width>160</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
-    <text>ADCore version</text>
+    <name>Label</name>
+    <text>ADCore version:</text>
     <x>20</x>
-    <y>85</y>
+    <y>130</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #29</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ADCoreVersion_RBV</pv_name>
     <x>170</x>
-    <y>86</y>
+    <y>131</y>
     <width>160</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #33</name>
-    <text>Plugin version</text>
+    <name>Label</name>
+    <text>Plugin version:</text>
     <x>20</x>
-    <y>109</y>
+    <y>154</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #36</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DriverVersion_RBV</pv_name>
     <x>170</x>
-    <y>110</y>
+    <y>155</y>
     <width>160</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #40</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDArrayAddress</pv_name>
     <x>170</x>
-    <y>160</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>205</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #44</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDArrayAddress_RBV</pv_name>
     <x>276</x>
-    <y>161</y>
+    <y>206</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
-    <text>Array address</text>
+    <name>Label</name>
+    <text>Array address:</text>
     <x>30</x>
-    <y>160</y>
+    <y>205</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #51</name>
-    <text>Array port</text>
+    <name>Label</name>
+    <text>Array port:</text>
     <x>60</x>
-    <y>135</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>180</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #54</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDArrayPort</pv_name>
     <x>170</x>
-    <y>135</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>180</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #58</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDArrayPort_RBV</pv_name>
     <x>276</x>
-    <y>136</y>
+    <y>181</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #62</name>
-    <text>Enable</text>
+    <name>Label</name>
+    <text>Enable:</text>
     <x>100</x>
-    <y>185</y>
+    <y>230</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #65</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableCallbacks</pv_name>
     <x>170</x>
-    <y>185</y>
+    <y>230</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #68</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
     <x>276</x>
-    <y>186</y>
+    <y>231</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #72</name>
-    <x>5</x>
-    <y>30</y>
-    <width>380</width>
-    <height>530</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Max # threads:</text>
+    <x>30</x>
+    <y>380</y>
+    <width>130</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #75</name>
-    <text>Max # threads</text>
-    <x>30</x>
-    <y>335</y>
-    <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #78</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxThreads_RBV</pv_name>
     <x>170</x>
-    <y>336</y>
+    <y>381</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #82</name>
-    <text>Callbacks block</text>
+    <name>Label</name>
+    <text>Callbacks block:</text>
     <x>10</x>
-    <y>285</y>
+    <y>330</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #85</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)BlockingCallbacks</pv_name>
     <x>170</x>
-    <y>285</y>
+    <y>330</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #88</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BlockingCallbacks_RBV</pv_name>
     <x>276</x>
-    <y>286</y>
+    <y>331</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #92</name>
-    <text>Sort mode</text>
+    <name>Label</name>
+    <text>Sort mode:</text>
     <x>70</x>
-    <y>385</y>
+    <y>430</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #95</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)SortMode</pv_name>
     <x>170</x>
-    <y>385</y>
+    <y>430</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #98</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SortMode_RBV</pv_name>
     <x>276</x>
-    <y>386</y>
+    <y>431</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #102</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NumThreads</pv_name>
     <x>170</x>
-    <y>310</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>355</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #106</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NumThreads_RBV</pv_name>
     <x>276</x>
-    <y>311</y>
+    <y>356</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #110</name>
-    <text># threads</text>
+    <name>Label</name>
+    <text># threads:</text>
     <x>70</x>
-    <y>310</y>
+    <y>355</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #113</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SortTime</pv_name>
     <x>170</x>
-    <y>410</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>455</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #117</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SortTime_RBV</pv_name>
     <x>276</x>
-    <y>411</y>
+    <y>456</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #121</name>
-    <text>Sort time</text>
+    <name>Label</name>
+    <text>Sort time:</text>
     <x>70</x>
-    <y>410</y>
+    <y>455</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #124</name>
-    <text>Queue size/free</text>
+    <name>Label</name>
+    <text>Queue size/free:</text>
     <x>10</x>
-    <y>360</y>
+    <y>405</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #127</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)QueueFree</pv_name>
     <x>276</x>
-    <y>360</y>
+    <y>405</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #131</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)QueueSize</pv_name>
     <x>170</x>
-    <y>360</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>405</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #135</name>
-    <text>Sort size/free</text>
+    <name>Label</name>
+    <text>Sort size/free:</text>
     <x>20</x>
-    <y>435</y>
+    <y>480</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #138</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SortFree</pv_name>
     <x>276</x>
-    <y>435</y>
+    <y>480</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #142</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SortSize</pv_name>
     <x>170</x>
-    <y>435</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>480</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #146</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DisorderedArrays_RBV</pv_name>
     <x>276</x>
-    <y>461</y>
+    <y>506</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #150</name>
-    <text># disordered</text>
+    <name>Label</name>
+    <text># disordered:</text>
     <x>40</x>
-    <y>460</y>
+    <y>505</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #153</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)DisorderedArrays</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)DisorderedArrays</pv_name>
     <text>Reset to 0</text>
     <x>170</x>
-    <y>460</y>
+    <y>505</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #156</name>
-    <text>Max. byte rate</text>
+    <name>Label</name>
+    <text>Max. byte rate:</text>
     <x>20</x>
-    <y>260</y>
+    <y>305</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #159</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MaxByteRate</pv_name>
     <x>170</x>
-    <y>260</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>305</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #163</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxByteRate_RBV</pv_name>
     <x>276</x>
-    <y>261</y>
+    <y>306</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #167</name>
-    <text>Min. time</text>
+    <name>Label</name>
+    <text>Min. time:</text>
     <x>70</x>
-    <y>210</y>
+    <y>255</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #170</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MinCallbackTime</pv_name>
     <x>170</x>
-    <y>210</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>255</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #174</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MinCallbackTime_RBV</pv_name>
     <x>276</x>
-    <y>211</y>
+    <y>256</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #178</name>
-    <text>Max. array rate</text>
+    <name>Label</name>
+    <text>Max. array rate:</text>
     <x>10</x>
-    <y>235</y>
+    <y>280</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #181</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MaxArrayRate</pv_name>
     <x>170</x>
-    <y>235</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>280</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #185</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxArrayRate_RBV</pv_name>
     <x>276</x>
-    <y>236</y>
+    <y>281</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #189</name>
-    <x>390</x>
-    <y>30</y>
-    <width>380</width>
-    <height>530</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Execution time:</text>
+    <x>406</x>
+    <y>130</y>
+    <width>140</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #192</name>
-    <text>Execution time</text>
-    <x>406</x>
-    <y>85</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #195</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ExecutionTime_RBV</pv_name>
     <x>556</x>
-    <y>86</y>
+    <y>131</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #199</name>
+    <name>Label</name>
     <text>msec</text>
     <x>662</x>
-    <y>85</y>
+    <y>130</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #202</name>
-    <text>Array rate</text>
+    <name>Label</name>
+    <text>Array rate:</text>
     <x>446</x>
-    <y>60</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>105</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #205</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
     <x>556</x>
-    <y>61</y>
+    <y>106</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #209</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
     <x>662</x>
-    <y>36</y>
+    <y>81</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #213</name>
-    <text>Array counter</text>
+    <name>Label</name>
+    <text>Array counter:</text>
     <x>416</x>
-    <y>35</y>
+    <y>80</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #216</name>
-    <text>Array size</text>
+    <name>Label</name>
+    <text>Array size:</text>
     <x>446</x>
-    <y>185</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>230</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #219</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize0_RBV</pv_name>
     <x>556</x>
-    <y>186</y>
+    <y>231</y>
     <width>65</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #223</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize1_RBV</pv_name>
     <x>626</x>
-    <y>186</y>
+    <y>231</y>
     <width>65</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #227</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySize2_RBV</pv_name>
     <x>696</x>
-    <y>186</y>
+    <y>231</y>
     <width>65</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #231</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)ArrayCounter</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)ArrayCounter</pv_name>
     <text>Reset to 0</text>
     <x>556</x>
-    <y>35</y>
+    <y>80</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #234</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DroppedArrays_RBV</pv_name>
     <x>662</x>
-    <y>111</y>
+    <y>156</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #238</name>
-    <text>Dropped arrays</text>
+    <name>Label</name>
+    <text>Dropped arrays:</text>
     <x>406</x>
-    <y>110</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>155</y>
+    <width>140</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #241</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)DroppedArrays</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)DroppedArrays</pv_name>
     <text>Reset to 0</text>
     <x>556</x>
-    <y>110</y>
+    <y>155</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #244</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DroppedOutputArrays_RBV</pv_name>
     <x>661</x>
-    <y>136</y>
+    <y>181</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #248</name>
-    <text>Dropped outputs</text>
+    <name>Label</name>
+    <text>Dropped outputs:</text>
     <x>395</x>
-    <y>135</y>
+    <y>180</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #251</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)DroppedOutputArrays</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)DroppedOutputArrays</pv_name>
     <text>Reset to 0</text>
     <x>555</x>
-    <y>135</y>
+    <y>180</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #254</name>
-    <text>Array callbacks</text>
+    <name>Label</name>
+    <text>Array callbacks:</text>
     <x>10</x>
-    <y>485</y>
+    <y>530</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #257</name>
-    <x>50</x>
-    <y>535</y>
-    <width>220</width>
-    <height>20</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="action_button" version="3.0.0">
-      <name>related display #260</name>
-      <actions>
-        <action type="open_display">
-          <file>asynRecord.opi</file>
-          <macros>
-            <R>$(R)AsynIO</R>
-          </macros>
-          <target>tab</target>
-          <description>asynRecord</description>
-        </action>
-      </actions>
-      <text></text>
-      <x>120</x>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #263</name>
-      <text>asyn record</text>
-      <width>110</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #266</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ArrayCallbacks</pv_name>
     <x>170</x>
-    <y>485</y>
+    <y>530</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #269</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArrayCallbacks_RBV</pv_name>
     <x>276</x>
-    <y>486</y>
+    <y>531</y>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #273</name>
-    <text>Process plugin</text>
+    <name>Label</name>
+    <text>Process plugin:</text>
     <x>23</x>
-    <y>510</y>
+    <y>555</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #276</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)ProcessPlugin</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)ProcessPlugin</pv_name>
     <text>Process</text>
     <x>170</x>
-    <y>510</y>
+    <y>555</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #279</name>
-    <text>Data type</text>
+    <name>Label</name>
+    <text>Data type:</text>
     <x>456</x>
-    <y>260</y>
+    <y>305</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #282</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DataType_RBV</pv_name>
     <x>556</x>
-    <y>261</y>
+    <y>306</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #286</name>
-    <text>Unique ID</text>
+    <name>Label</name>
+    <text>Unique ID:</text>
     <x>456</x>
-    <y>335</y>
+    <y>380</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #289</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)UniqueId_RBV</pv_name>
     <x>556</x>
-    <y>336</y>
+    <y>381</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #293</name>
-    <text>Color mode</text>
+    <name>Label</name>
+    <text>Color mode:</text>
     <x>446</x>
-    <y>285</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>330</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #296</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ColorMode_RBV</pv_name>
     <x>556</x>
-    <y>286</y>
+    <y>331</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #300</name>
-    <text>Bayer pattern</text>
+    <name>Label</name>
+    <text>Bayer pattern:</text>
     <x>416</x>
-    <y>310</y>
+    <y>355</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #303</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BayerPattern_RBV</pv_name>
     <x>556</x>
-    <y>311</y>
+    <y>356</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #307</name>
-    <file>ADAttrFile.bob</file>
-    <x>406</x>
-    <y>385</y>
-    <width>350</width>
-    <height>110</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #309</name>
-    <text>Time stamp</text>
+    <name>Label</name>
+    <text>Time stamp:</text>
     <x>446</x>
-    <y>360</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>405</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #312</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TimeStamp_RBV</pv_name>
     <x>556</x>
-    <y>361</y>
+    <y>406</y>
     <width>150</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #316</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDimensions_RBV</pv_name>
     <x>556</x>
-    <y>161</y>
+    <y>206</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #320</name>
-    <text># dimensions</text>
+    <name>Label</name>
+    <text># dimensions:</text>
     <x>426</x>
-    <y>160</y>
+    <y>205</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #323</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)Codec_RBV</pv_name>
     <x>556</x>
-    <y>211</y>
+    <y>256</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #327</name>
-    <text>Codec</text>
+    <name>Label</name>
+    <text>Codec:</text>
     <x>426</x>
-    <y>210</y>
+    <y>255</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #330</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)CompressedSize_RBV</pv_name>
     <x>556</x>
-    <y>236</y>
+    <y>281</y>
     <width>79</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #334</name>
-    <text>Compressed size</text>
+    <name>Label</name>
+    <text>Compressed size:</text>
     <x>426</x>
-    <y>235</y>
+    <y>280</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDPluginTimeSeries.bob b/99-Shared/adcore/NDPluginTimeSeries.bob
index 05e655dbc007f23887d106734ffcb11c9d317d8e..9f5edd014c9f8f68da2728e973642707cde88782 100644
--- a/99-Shared/adcore/NDPluginTimeSeries.bob
+++ b/99-Shared/adcore/NDPluginTimeSeries.bob
@@ -3,372 +3,544 @@
   <name>NDPluginTimeSeries</name>
   <x>581</x>
   <y>191</y>
-  <width>695</width>
+  <height>650</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>695</width>
-    <height>25</height>
+    <name>BGGrey02-background_1</name>
+    <x>410</x>
+    <y>60</y>
+    <width>305</width>
+    <height>555</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>695</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>715</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>composite #12</name>
-    <file>NDPluginBase.bob</file>
-    <x>5</x>
-    <y>40</y>
+    <name>Linking Container</name>
+    <file>NDPluginBase.opi</file>
+    <x>10</x>
+    <y>60</y>
     <width>380</width>
     <height>555</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #14</name>
-    <x>390</x>
-    <y>40</y>
-    <width>300</width>
-    <height>320</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>715</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #17</name>
-    <text>Acquire</text>
-    <x>408</x>
-    <y>55</y>
+    <name>Label</name>
+    <text>Acquire:</text>
+    <x>430</x>
+    <y>100</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #20</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TSAcquire</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TSAcquire</pv_name>
     <text>Erase/Start</text>
-    <x>483</x>
-    <y>55</y>
+    <x>505</x>
+    <y>100</y>
     <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #23</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TSAcquire</pv_name>
         <value>0</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TSAcquire</pv_name>
     <text>Stop</text>
-    <x>573</x>
-    <y>55</y>
+    <x>595</x>
+    <y>100</y>
     <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
-    <text>Elapsed time</text>
-    <x>420</x>
-    <y>105</y>
+    <name>Label</name>
+    <text>Elapsed time:</text>
+    <x>442</x>
+    <y>150</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
-    <text>Status</text>
-    <x>480</x>
-    <y>80</y>
+    <name>Label</name>
+    <text>Status:</text>
+    <x>502</x>
+    <y>125</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #32</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSElapsedTime</pv_name>
-    <x>545</x>
-    <y>106</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>152</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #36</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSAcquiring</pv_name>
-    <x>545</x>
-    <y>81</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>126</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #40</name>
-    <text>AcquireMode</text>
-    <x>430</x>
-    <y>255</y>
+    <name>Label</name>
+    <text>AcquireMode:</text>
+    <x>452</x>
+    <y>300</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #43</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TSAcquireMode</pv_name>
-    <x>545</x>
-    <y>255</y>
+    <x>580</x>
+    <y>300</y>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #46</name>
-    <text>Averaging time</text>
-    <x>400</x>
-    <y>204</y>
+    <name>Label</name>
+    <text>Averaging time:</text>
+    <x>420</x>
+    <y>219</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #49</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSAveragingTime_RBV</pv_name>
-    <x>545</x>
-    <y>180</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>225</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #53</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TSAveragingTime</pv_name>
-    <x>545</x>
-    <y>204</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>249</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #57</name>
-    <text># Average</text>
-    <x>450</x>
-    <y>230</y>
+    <name>Label</name>
+    <text># Average:</text>
+    <x>472</x>
+    <y>275</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #60</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSNumAverage</pv_name>
-    <x>545</x>
-    <y>231</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>579</x>
+    <y>276</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #64</name>
-    <text>Time link</text>
-    <x>450</x>
-    <y>130</y>
+    <name>Label</name>
+    <text>Time link:</text>
+    <x>472</x>
+    <y>175</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #67</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TSTimePerPointLink.DOL</pv_name>
-    <x>545</x>
-    <y>130</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>175</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #71</name>
-    <text>Time/point</text>
-    <x>440</x>
-    <y>155</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text>Time/point:</text>
+    <x>462</x>
+    <y>200</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #74</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSTimePerPoint</pv_name>
-    <x>545</x>
-    <y>156</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>579</x>
+    <y>201</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #78</name>
-    <text>Time series</text>
-    <x>447</x>
-    <y>365</y>
+    <name>Label</name>
+    <text>Time series:</text>
+    <x>449</x>
+    <y>421</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #81</name>
+    <name>Menu Button</name>
     <actions>
       <action type="open_display">
         <file>NDTimeSeriesPlot.opi</file>
@@ -500,120 +672,178 @@
       </action>
     </actions>
     <text>Plots</text>
-    <x>560</x>
-    <y>365</y>
+    <x>562</x>
+    <y>421</y>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #99</name>
-    <text>Read rate</text>
-    <x>450</x>
-    <y>330</y>
+    <name>Label</name>
+    <text>Read rate:</text>
+    <x>452</x>
+    <y>386</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #102</name>
-    <text>Current point</text>
-    <x>410</x>
-    <y>305</y>
+    <name>Label</name>
+    <text>Current point:</text>
+    <x>432</x>
+    <y>355</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #105</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSCurrentPoint</pv_name>
-    <x>545</x>
-    <y>306</y>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>581</x>
+    <y>357</y>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #109</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TSRead.PROC</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TSRead.PROC</pv_name>
     <text>Read</text>
-    <x>630</x>
-    <y>330</y>
+    <x>632</x>
+    <y>386</y>
     <width>50</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #112</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TSRead.SCAN</pv_name>
-    <x>545</x>
-    <y>330</y>
+    <x>547</x>
+    <y>386</y>
     <width>80</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #115</name>
-    <text># Time points</text>
-    <x>410</x>
-    <y>280</y>
+    <name>Label</name>
+    <text># Time points:</text>
+    <x>432</x>
+    <y>325</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #118</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TSNumPoints</pv_name>
-    <x>545</x>
-    <y>280</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>580</x>
+    <y>328</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDProcessTIFF.bob b/99-Shared/adcore/NDProcessTIFF.bob
index cfce7cfabfb390e72df88b4446a1c28900c5b1be..9619b368b3849bb88fa6fb226b3eabf78b5e34c8 100644
--- a/99-Shared/adcore/NDProcessTIFF.bob
+++ b/99-Shared/adcore/NDProcessTIFF.bob
@@ -4,472 +4,727 @@
   <x>360</x>
   <y>159</y>
   <width>1070</width>
+  <height>800</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>1070</width>
-    <height>26</height>
+    <name>BGGrey02-background</name>
+    <x>400</x>
+    <y>93</y>
+    <width>653</width>
+    <height>555</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>6</y>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_6</name>
+    <x>419</x>
+    <y>110</y>
+    <width>621</width>
+    <height>230</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_7</name>
+    <x>419</x>
+    <y>360</y>
+    <width>621</width>
+    <height>170</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_19</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
     <width>1070</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>composite #12</name>
-    <file>NDPluginBase.bob</file>
-    <x>5</x>
-    <y>40</y>
+    <name>Linking Container</name>
+    <file>NDPluginBase.opi</file>
+    <y>93</y>
     <width>380</width>
     <height>555</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #14</name>
-    <x>390</x>
-    <y>40</y>
-    <width>675</width>
-    <height>280</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>419</x>
+    <y>451</y>
+    <width>634</width>
+    <height>59</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <transparent>true</transparent>
+    <actions>
+    </actions>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Read status:</text>
+      <x>10</x>
+      <width>110</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)WriteStatus</pv_name>
+      <x>129</x>
+      <width>120</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Read message:</text>
+      <y>25</y>
+      <width>120</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)WriteMessage</pv_name>
+      <x>129</x>
+      <y>28</y>
+      <width>482</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #17</name>
-    <text>Last filename</text>
-    <x>417</x>
-    <y>246</y>
-    <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1070</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Last filename:</text>
+    <x>410</x>
+    <y>426</y>
+    <width>130</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #20</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FullFileName_RBV</pv_name>
-    <x>556</x>
-    <y>247</y>
-    <width>500</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>549</x>
+    <y>427</y>
+    <width>481</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #24</name>
-    <text>Filename format</text>
-    <x>397</x>
-    <y>221</y>
+    <name>Label</name>
+    <text>Filename format:</text>
+    <x>390</x>
+    <y>401</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #27</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileTemplate_RBV</pv_name>
-    <x>556</x>
-    <y>198</y>
-    <width>160</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>549</x>
+    <y>278</y>
+    <width>149</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #31</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileTemplate</pv_name>
-    <x>556</x>
-    <y>221</y>
+    <x>549</x>
+    <y>401</y>
     <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #35</name>
-    <text>Auto increment</text>
-    <x>407</x>
-    <y>173</y>
+    <name>Label</name>
+    <text>Auto increment:</text>
+    <x>400</x>
+    <y>253</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #38</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoIncrement</pv_name>
-    <x>556</x>
-    <y>173</y>
+    <x>549</x>
+    <y>253</y>
     <width>64</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #41</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoIncrement_RBV</pv_name>
-    <x>625</x>
-    <y>174</y>
+    <x>618</x>
+    <y>254</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
-    <text>Next file #</text>
-    <x>437</x>
-    <y>147</y>
+    <name>Label</name>
+    <text>Next file #:</text>
+    <x>430</x>
+    <y>227</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #48</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileNumber</pv_name>
-    <x>556</x>
-    <y>146</y>
+    <x>549</x>
+    <y>226</y>
     <width>60</width>
-    <height>22</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="12.871287128712872">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #52</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileNumber_RBV</pv_name>
-    <x>621</x>
-    <y>148</y>
+    <x>614</x>
+    <y>228</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #56</name>
-    <text>File name</text>
-    <x>457</x>
-    <y>121</y>
+    <name>Label</name>
+    <text>File name:</text>
+    <x>450</x>
+    <y>201</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #59</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FileName</pv_name>
-    <x>556</x>
-    <y>121</y>
-    <width>500</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>549</x>
+    <y>201</y>
+    <width>481</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #63</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FileName_RBV</pv_name>
-    <x>556</x>
-    <y>98</y>
+    <x>549</x>
+    <y>178</y>
     <width>175</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #67</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FilePath_RBV</pv_name>
-    <x>556</x>
-    <y>50</y>
-    <width>385</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>549</x>
+    <y>130</y>
+    <width>311</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #71</name>
-    <text>File path</text>
-    <x>457</x>
-    <y>73</y>
+    <name>Label</name>
+    <text>File path:</text>
+    <x>450</x>
+    <y>153</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #74</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)FilePath</pv_name>
-    <x>556</x>
-    <y>73</y>
-    <width>500</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>549</x>
+    <y>153</y>
+    <width>481</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #78</name>
+    <name>Label</name>
     <text>Exists:</text>
-    <x>945</x>
-    <y>50</y>
+    <x>901</x>
+    <y>128</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #81</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)FilePathExists_RBV</pv_name>
-    <x>1020</x>
-    <y>50</y>
+    <x>987</x>
+    <y>128</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #85</name>
+    <name>Label</name>
     <text>Example: %s%s_%3.3d.$(EXT)</text>
-    <x>730</x>
-    <y>221</y>
+    <x>770</x>
+    <y>401</y>
     <width>260</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #88</name>
-    <x>426</x>
-    <y>271</y>
-    <width>634</width>
-    <height>45</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>text #91</name>
-      <text>Read status</text>
-      <x>10</x>
-      <width>110</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #94</name>
-      <pv_name>$(P)$(R)WriteStatus</pv_name>
-      <x>129</x>
-      <width>120</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="40" green="147" blue="21">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="187" green="187" blue="187">
-        </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #98</name>
-      <text>Read message</text>
-      <y>25</y>
-      <width>120</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #101</name>
-      <pv_name>$(P)$(R)WriteMessage</pv_name>
-      <x>129</x>
-      <y>28</y>
-      <width>505</width>
-      <height>14</height>
-      <foreground_color>
-        <color red="253" green="0" blue="0">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="218" green="218" blue="218">
-        </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDROI.bob b/99-Shared/adcore/NDROI.bob
index 523d0721097bf6ea524e569c87e6d543cff6eff4..c79456be61dbe4d97534dcc9dfcc1c113f866dd0 100644
--- a/99-Shared/adcore/NDROI.bob
+++ b/99-Shared/adcore/NDROI.bob
@@ -3,1374 +3,1762 @@
   <name>NDROI</name>
   <x>452</x>
   <y>60</y>
-  <width>755</width>
-  <height>605</height>
+  <height>660</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>9</y>
-    <width>755</width>
-    <height>26</height>
+    <name>BGGrey02-background_7</name>
+    <x>407</x>
+    <y>70</y>
+    <width>373</width>
+    <height>555</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>10</y>
-    <width>755</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #12</name>
-    <x>533</x>
-    <y>41</y>
-    <width>107</width>
-    <height>21</height>
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color red="128" green="0" blue="255">
       </color>
     </line_color>
-    <background_color>
-      <color red="218" green="218" blue="218">
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>NDPluginBase.opi</file>
+    <x>10</x>
+    <y>70</y>
+    <width>380</width>
+    <height>555</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #15</name>
-    <text>Definition</text>
-    <x>536</x>
-    <y>42</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <name>Label</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #18</name>
-    <x>390</x>
-    <y>40</y>
-    <width>360</width>
-    <height>560</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </line_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #21</name>
-    <text>Data type</text>
-    <x>452</x>
-    <y>95</y>
+    <name>Label</name>
+    <text>Data type:</text>
+    <x>457</x>
+    <y>115</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #24</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)DataTypeOut</pv_name>
-    <x>555</x>
-    <y>96</y>
+    <x>560</x>
+    <y>116</y>
     <width>80</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #27</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)DataTypeOut_RBV</pv_name>
-    <x>645</x>
-    <y>96</y>
+    <x>650</x>
+    <y>116</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #31</name>
-    <text>Name</text>
-    <x>502</x>
-    <y>70</y>
+    <name>Label</name>
+    <text>Name:</text>
+    <x>507</x>
+    <y>90</y>
     <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #34</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)Name</pv_name>
-    <x>553</x>
-    <y>70</y>
+    <x>558</x>
+    <y>90</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #38</name>
-    <text>Scale divisor</text>
-    <x>412</x>
-    <y>145</y>
+    <name>Label</name>
+    <text>Scale divisor:</text>
+    <x>417</x>
+    <y>165</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #41</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)Scale_RBV</pv_name>
-    <x>645</x>
-    <y>146</y>
+    <x>650</x>
+    <y>166</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #45</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)Scale</pv_name>
-    <x>553</x>
-    <y>145</y>
+    <x>558</x>
+    <y>165</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #49</name>
-    <file>NDPluginBase.bob</file>
-    <x>5</x>
-    <y>40</y>
-    <width>380</width>
-    <height>555</height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #51</name>
-    <x>395</x>
-    <y>200</y>
-    <width>350</width>
-    <height>395</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Y</text>
+    <x>616</x>
+    <y>230</y>
+    <width>10</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #54</name>
-    <text>Y</text>
-    <x>620</x>
-    <y>206</y>
-    <width>10</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #57</name>
+    <name>Label</name>
     <text>Z</text>
-    <x>700</x>
-    <y>206</y>
+    <x>696</x>
+    <y>230</y>
     <width>10</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #60</name>
+    <name>Label</name>
     <text>X</text>
-    <x>540</x>
-    <y>206</y>
+    <x>536</x>
+    <y>230</y>
     <width>10</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #63</name>
-    <text>Auto size</text>
-    <x>412</x>
-    <y>500</y>
+    <name>Label</name>
+    <text>Auto size:</text>
+    <x>408</x>
+    <y>524</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #66</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoSizeY_RBV</pv_name>
-    <x>595</x>
-    <y>480</y>
+    <x>591</x>
+    <y>504</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #70</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoSizeY</pv_name>
-    <x>595</x>
-    <y>500</y>
+    <x>591</x>
+    <y>524</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #73</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoSizeZ_RBV</pv_name>
-    <x>675</x>
-    <y>480</y>
+    <x>671</x>
+    <y>504</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #77</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoSizeZ</pv_name>
-    <x>675</x>
-    <y>500</y>
+    <x>671</x>
+    <y>524</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #80</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoSizeX</pv_name>
-    <x>515</x>
-    <y>500</y>
+    <x>511</x>
+    <y>524</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #83</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)AutoSizeX_RBV</pv_name>
-    <x>515</x>
-    <y>480</y>
+    <x>511</x>
+    <y>504</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #87</name>
-    <text>Input Size</text>
-    <x>402</x>
-    <y>227</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Input Size:</text>
+    <x>398</x>
+    <y>251</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #90</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxSizeX_RBV</pv_name>
-    <x>515</x>
-    <y>228</y>
+    <x>511</x>
+    <y>252</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #94</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxSizeY_RBV</pv_name>
-    <x>595</x>
-    <y>228</y>
+    <x>591</x>
+    <y>252</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #98</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MaxSizeZ_RBV</pv_name>
-    <x>675</x>
-    <y>228</y>
+    <x>671</x>
+    <y>252</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #102</name>
-    <text>Enable</text>
-    <x>442</x>
-    <y>272</y>
+    <name>Label</name>
+    <text>Enable:</text>
+    <x>438</x>
+    <y>296</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #105</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableY_RBV</pv_name>
-    <x>596</x>
-    <y>252</y>
+    <x>592</x>
+    <y>276</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #109</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableY</pv_name>
-    <x>591</x>
-    <y>272</y>
+    <x>587</x>
+    <y>296</y>
     <width>70</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #112</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableZ_RBV</pv_name>
-    <x>676</x>
-    <y>252</y>
+    <x>672</x>
+    <y>276</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #116</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableZ</pv_name>
-    <x>671</x>
-    <y>272</y>
+    <x>667</x>
+    <y>296</y>
     <width>70</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #119</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableX</pv_name>
-    <x>510</x>
-    <y>272</y>
+    <x>506</x>
+    <y>296</y>
     <width>70</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #122</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableX_RBV</pv_name>
-    <x>515</x>
-    <y>252</y>
+    <x>511</x>
+    <y>276</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #126</name>
-    <text>Binning</text>
-    <x>432</x>
-    <y>317</y>
+    <name>Label</name>
+    <text>Binning:</text>
+    <x>428</x>
+    <y>341</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #129</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)BinY</pv_name>
-    <x>595</x>
-    <y>317</y>
+    <x>591</x>
+    <y>341</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #133</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BinY_RBV</pv_name>
-    <x>595</x>
-    <y>297</y>
+    <x>591</x>
+    <y>321</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #137</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)BinZ</pv_name>
-    <x>675</x>
-    <y>317</y>
+    <x>671</x>
+    <y>341</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #141</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BinZ_RBV</pv_name>
-    <x>675</x>
-    <y>297</y>
+    <x>671</x>
+    <y>321</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #145</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)BinX</pv_name>
-    <x>515</x>
-    <y>317</y>
+    <x>511</x>
+    <y>341</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #149</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)BinX_RBV</pv_name>
-    <x>515</x>
-    <y>297</y>
+    <x>511</x>
+    <y>321</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #153</name>
-    <text>ROI start</text>
-    <x>412</x>
-    <y>362</y>
+    <name>Label</name>
+    <text>ROI start:</text>
+    <x>408</x>
+    <y>386</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #156</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MinY</pv_name>
-    <x>595</x>
-    <y>362</y>
+    <x>591</x>
+    <y>386</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #160</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MinY_RBV</pv_name>
-    <x>595</x>
-    <y>342</y>
+    <x>591</x>
+    <y>366</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #164</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MinZ</pv_name>
-    <x>675</x>
-    <y>362</y>
+    <x>671</x>
+    <y>386</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #168</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MinZ_RBV</pv_name>
-    <x>675</x>
-    <y>342</y>
+    <x>671</x>
+    <y>366</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #172</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)MinX_RBV</pv_name>
-    <x>515</x>
-    <y>342</y>
+    <x>511</x>
+    <y>366</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #176</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)MinX</pv_name>
-    <x>515</x>
-    <y>362</y>
+    <x>511</x>
+    <y>386</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #180</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)MinX</pv_name>
-    <x>514</x>
-    <y>385</y>
+    <x>510</x>
+    <y>409</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #184</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)MinY</pv_name>
-    <x>594</x>
-    <y>385</y>
+    <x>590</x>
+    <y>409</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #188</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)MinZ</pv_name>
-    <x>674</x>
-    <y>385</y>
+    <x>670</x>
+    <y>409</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #192</name>
-    <text>ROI size</text>
-    <x>422</x>
-    <y>430</y>
+    <name>Label</name>
+    <text>ROI size:</text>
+    <x>418</x>
+    <y>454</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #195</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SizeY</pv_name>
-    <x>595</x>
-    <y>430</y>
+    <x>591</x>
+    <y>454</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #199</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SizeY_RBV</pv_name>
-    <x>595</x>
-    <y>410</y>
+    <x>591</x>
+    <y>434</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #203</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SizeZ</pv_name>
-    <x>675</x>
-    <y>430</y>
+    <x>671</x>
+    <y>454</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #207</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SizeZ_RBV</pv_name>
-    <x>675</x>
-    <y>410</y>
+    <x>671</x>
+    <y>434</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #211</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)SizeX</pv_name>
-    <x>515</x>
-    <y>430</y>
+    <x>511</x>
+    <y>454</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #215</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)SizeX_RBV</pv_name>
-    <x>515</x>
-    <y>410</y>
+    <x>511</x>
+    <y>434</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #219</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)SizeX</pv_name>
-    <x>515</x>
-    <y>455</y>
+    <x>511</x>
+    <y>479</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #223</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)SizeY</pv_name>
-    <x>595</x>
-    <y>455</y>
+    <x>591</x>
+    <y>479</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="scrollbar" version="2.0.0">
-    <name>valuator #227</name>
+    <name>Scrollbar</name>
     <pv_name>$(P)$(R)SizeZ</pv_name>
-    <x>675</x>
-    <y>455</y>
+    <x>671</x>
+    <y>479</y>
     <width>60</width>
+    <actions>
+    </actions>
     <bar_length>1.0</bar_length>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #231</name>
-    <text>ROI Size</text>
-    <x>422</x>
-    <y>570</y>
+    <name>Label</name>
+    <text>ROI Size:</text>
+    <x>418</x>
+    <y>594</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #234</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySizeY_RBV</pv_name>
-    <x>595</x>
-    <y>571</y>
+    <x>591</x>
+    <y>595</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #238</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySizeZ_RBV</pv_name>
-    <x>675</x>
-    <y>571</y>
+    <x>671</x>
+    <y>595</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #242</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ArraySizeX_RBV</pv_name>
-    <x>515</x>
-    <y>571</y>
+    <x>511</x>
+    <y>595</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #246</name>
-    <text>Reverse</text>
-    <x>432</x>
-    <y>545</y>
+    <name>Label</name>
+    <text>Reverse:</text>
+    <x>428</x>
+    <y>569</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #249</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ReverseY_RBV</pv_name>
-    <x>595</x>
-    <y>525</y>
+    <x>591</x>
+    <y>549</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #253</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ReverseY</pv_name>
-    <x>595</x>
-    <y>545</y>
+    <x>591</x>
+    <y>569</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #256</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ReverseZ_RBV</pv_name>
-    <x>675</x>
-    <y>525</y>
+    <x>671</x>
+    <y>549</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #260</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ReverseZ</pv_name>
-    <x>675</x>
-    <y>545</y>
+    <x>671</x>
+    <y>569</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #263</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)ReverseX</pv_name>
-    <x>515</x>
-    <y>545</y>
+    <x>511</x>
+    <y>569</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #266</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)ReverseX_RBV</pv_name>
-    <x>515</x>
-    <y>525</y>
+    <x>511</x>
+    <y>549</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #270</name>
-    <text>Enable scaling</text>
-    <x>402</x>
-    <y>120</y>
+    <name>Label</name>
+    <text>Enable scaling:</text>
+    <x>407</x>
+    <y>141</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #273</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableScale</pv_name>
-    <x>555</x>
-    <y>121</y>
+    <x>560</x>
+    <y>141</y>
     <width>80</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #276</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)EnableScale_RBV</pv_name>
-    <x>645</x>
-    <y>121</y>
+    <x>650</x>
+    <y>141</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #280</name>
-    <text>Collapse dims</text>
-    <x>414</x>
-    <y>170</y>
+    <name>Label</name>
+    <text>Collapse dims:</text>
+    <x>419</x>
+    <y>190</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #283</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)CollapseDims</pv_name>
-    <x>557</x>
-    <y>171</y>
+    <x>562</x>
+    <y>191</y>
     <width>80</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #286</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)CollapseDims_RBV</pv_name>
-    <x>647</x>
-    <y>171</y>
+    <x>652</x>
+    <y>191</y>
     <width>80</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDStatsTimeSeriesBasicAll.bob b/99-Shared/adcore/NDStatsTimeSeriesBasicAll.bob
index 99a77869e167d44476417a8aa6cff0b7bae9064b..a71527da8a9c8c56fd97b644c9e534d3ef1be53b 100644
--- a/99-Shared/adcore/NDStatsTimeSeriesBasicAll.bob
+++ b/99-Shared/adcore/NDStatsTimeSeriesBasicAll.bob
@@ -3,923 +3,1010 @@
   <name>NDStatsTimeSeriesBasicAll</name>
   <x>464</x>
   <y>226</y>
-  <width>1435</width>
-  <height>655</height>
+  <width>1600</width>
+  <height>2000</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>1435</width>
-    <height>25</height>
+    <name>BGGrey02-background</name>
+    <y>40</y>
+    <width>1210</width>
+    <height>1000</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="10" green="0" blue="184">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="10" green="0" blue="184">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>5</y>
-    <width>1435</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="255" green="255" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_5</name>
+    <x>20</x>
+    <y>563</y>
+    <width>1120</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #12</name>
-    <x>5</x>
-    <y>40</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSTotal</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_35</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSTotal</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
-          </color>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #19</name>
-    <x>360</x>
-    <y>40</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSNet</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>756</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMinY</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSNet</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMinY</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>384</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #26</name>
-    <x>715</x>
-    <y>40</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMin</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMinX</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMinValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMinX</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>16</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #33</name>
-    <x>1070</x>
-    <y>40</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMax</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMin</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMaxValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMinValue</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
   </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #40</name>
-    <x>715</x>
-    <y>450</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSSigma</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_4</name>
+    <x>20</x>
+    <y>322</y>
+    <width>1120</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_34</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSSigma</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
-          </color>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #47</name>
-    <x>360</x>
-    <y>450</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMean</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>757</x>
+      <y>6</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSTimestamp</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMeanValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSTimestamp</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>384</x>
+      <y>6</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #54</name>
-    <x>5</x>
-    <y>245</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMinX</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSNet</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMinX</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSNet</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>12</x>
+      <y>6</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #61</name>
-    <x>360</x>
-    <y>245</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMinY</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSTotal</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMinY</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSTotal</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
   </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #68</name>
-    <x>715</x>
-    <y>245</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMaxX</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>20</x>
+    <y>80</y>
+    <width>1120</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMaxX</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
-          </color>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #75</name>
-    <x>1070</x>
-    <y>245</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSMaxY</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>757</x>
+      <y>10</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSSigma</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSMaxY</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSSigma</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>384</x>
+      <y>10</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
         </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #82</name>
-    <x>1070</x>
-    <y>450</y>
-    <width>350</width>
-    <height>200</height>
-    <title>$(P)$(R)TSTimestamp</title>
-    <x_axis>
-      <title>Time (s)</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMean</title>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>Value</title>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>$(traces[0].y_pv)</name>
-        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-        <y_pv>$(P)$(R)TSTimestamp</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMeanValue</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
           </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>10</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #89</name>
-    <text>Current point</text>
-    <x>55</x>
-    <y>510</y>
+    <name>Label</name>
+    <text>Current point:</text>
+    <x>26</x>
+    <y>191</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #92</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TS:TSCurrentPoint</pv_name>
-    <x>190</x>
-    <y>511</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>170</x>
+    <y>191</y>
+    <width>85</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #96</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TS:TSRead.SCAN</pv_name>
     <x>170</x>
-    <y>535</y>
+    <y>221</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #99</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
     <text>Read</text>
-    <x>275</x>
-    <y>535</y>
-    <width>70</width>
+    <x>276</x>
+    <y>221</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #102</name>
-    <text>Read rate</text>
-    <x>75</x>
-    <y>535</y>
+    <name>Label</name>
+    <text>Read rate:</text>
+    <x>67</x>
+    <y>221</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #105</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TS:TSNumPoints</pv_name>
-    <x>190</x>
-    <y>486</y>
-    <width>60</width>
-    <height>19</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>170</x>
+    <y>160</y>
+    <width>85</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #109</name>
-    <text>Number of points</text>
-    <x>25</x>
-    <y>485</y>
-    <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>Number of points:</text>
+    <x>32</x>
+    <y>162</y>
+    <width>125</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #112</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
     <text>Erase/Start</text>
-    <x>95</x>
-    <y>460</y>
-    <width>90</width>
+    <x>171</x>
+    <y>100</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #115</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
         <value>2</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
     <text>Stop</text>
-    <x>190</x>
-    <y>460</y>
-    <width>60</width>
+    <x>277</x>
+    <y>100</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #118</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TS:TSAcquiring</pv_name>
-    <x>255</x>
-    <y>461</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>172</x>
+    <y>134</y>
+    <width>85</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #122</name>
-    <text>Acquire</text>
-    <x>20</x>
-    <y>460</y>
+    <name>Label</name>
+    <text>Acquire:</text>
+    <x>101</x>
+    <y>100</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #125</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>NDPluginTimeSeries.opi</file>
@@ -931,37 +1018,385 @@
       </action>
     </actions>
     <text>More</text>
-    <x>275</x>
-    <y>560</y>
-    <width>70</width>
+    <x>276</x>
+    <y>251</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #128</name>
-    <text>AcquireMode</text>
-    <x>55</x>
-    <y>559</y>
+    <name>Label</name>
+    <text>AcquireMode:</text>
+    <x>47</x>
+    <y>251</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #131</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TS:TSAcquireMode</pv_name>
     <x>170</x>
-    <y>559</y>
+    <y>251</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1210</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>730</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>Status:</text>
+    <x>86</x>
+    <y>134</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_9</name>
+    <x>20</x>
+    <y>804</y>
+    <width>1120</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_39</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>753</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMaxY</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMaxY</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>381</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMaxX</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMaxX</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+    <widget type="xyplot" version="2.0.0">
+      <name>XY Graph</name>
+      <x>13</x>
+      <y>8</y>
+      <width>350</width>
+      <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSMax</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
+      <x_axis>
+        <title>Time (s)</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </x_axis>
+      <y_axes>
+        <y_axis>
+          <title>Value</title>
+          <autoscale>true</autoscale>
+          <log_scale>false</log_scale>
+          <minimum>0.0</minimum>
+          <maximum>100.0</maximum>
+          <show_grid>true</show_grid>
+          <title_font>
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+            </font>
+          </title_font>
+          <scale_font>
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+            </font>
+          </scale_font>
+          <visible>true</visible>
+        </y_axis>
+      </y_axes>
+      <traces>
+        <trace>
+          <name>$(traces[0].y_pv)</name>
+          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+          <y_pv>$(P)$(R)TSMaxValue</y_pv>
+          <err_pv></err_pv>
+          <axis>0</axis>
+          <trace_type>1</trace_type>
+          <color>
+            <color red="75" green="110" blue="199">
+            </color>
+          </color>
+          <line_width>1</line_width>
+          <line_style>0</line_style>
+          <point_type>0</point_type>
+          <point_size>4</point_size>
+          <visible>true</visible>
+        </trace>
+      </traces>
+    </widget>
+  </widget>
 </display>
diff --git a/99-Shared/adcore/NDStatsTimeSeriesCentroidAll.bob b/99-Shared/adcore/NDStatsTimeSeriesCentroidAll.bob
index 15df06b0dc2a0d378d91b08646847db65d7f36bb..54fe1e5c6b9cb0e59b6fc9b39d77aa97bd976b7f 100644
--- a/99-Shared/adcore/NDStatsTimeSeriesCentroidAll.bob
+++ b/99-Shared/adcore/NDStatsTimeSeriesCentroidAll.bob
@@ -3,70 +3,80 @@
   <name>NDStatsTimeSeriesCentroidAll</name>
   <x>305</x>
   <y>202</y>
-  <width>1435</width>
-  <height>780</height>
+  <width>1600</width>
+  <height>1200</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>5</y>
-    <width>1435</width>
-    <height>25</height>
-    <line_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </line_color>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_2</name>
+    <x>20</x>
+    <y>315</y>
+    <width>1560</width>
+    <height>220</height>
+    <style>3</style>
     <background_color>
-      <color red="10" green="0" blue="184">
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
     </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>5</y>
-    <width>1435</width>
-    <height>25</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <widget type="label" version="2.0.0">
+      <name>Label_31</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
       </font>
-    </font>
-    <foreground_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #12</name>
-    <x>10</x>
-    <y>40</y>
-    <width>1415</width>
-    <height>610</height>
-    <style>3</style>
-    <transparent>true</transparent>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #15</name>
+      <name>XY Graph</name>
+      <x>1134</x>
+      <y>9</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSCentroidX</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSSigmaXY</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -78,13 +88,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -94,7 +104,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSCentroidX</y_pv>
+          <y_pv>$(P)$(R)TSSigmaXY</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -105,30 +115,46 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #22</name>
-      <x>355</x>
+      <name>XY Graph</name>
+      <x>754</x>
+      <y>9</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSCentroidY</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSSigmaY</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -140,13 +166,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -156,7 +182,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSCentroidY</y_pv>
+          <y_pv>$(P)$(R)TSSigmaY</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -167,30 +193,46 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #29</name>
-      <x>710</x>
+      <name>XY Graph</name>
+      <x>380</x>
+      <y>9</y>
       <width>350</width>
       <height>200</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
       <title>$(P)$(R)TSSigmaX</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -202,13 +244,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -229,343 +271,713 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
-    <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #36</name>
-      <x>1065</x>
-      <width>350</width>
-      <height>200</height>
-      <title>$(P)$(R)TSSigmaY</title>
-      <x_axis>
-        <title>Time (s)</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>Value</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>$(traces[0].y_pv)</name>
-          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSSigmaY</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="75" green="110" blue="199">
-            </color>
-          </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>20</x>
+    <y>70</y>
+    <width>1560</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
     </widget>
-    <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #43</name>
-      <y>410</y>
-      <width>350</width>
-      <height>200</height>
-      <title>$(P)$(R)TSCentroidTotal</title>
-      <x_axis>
-        <title>Time (s)</title>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1600</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>TITLE</class>
+    <text>$(P)$(R)</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1600</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>400</x>
+    <y>80</y>
+    <width>350</width>
+    <height>200</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(R)TSCentroidX</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <x_axis>
+      <title>Time (s)</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Value</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>Value</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>$(traces[0].y_pv)</name>
-          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSCentroidTotal</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="75" green="110" blue="199">
-            </color>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+        <y_pv>$(P)$(R)TSCentroidX</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
           </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
-    </widget>
-    <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #50</name>
-      <x>355</x>
-      <y>410</y>
-      <width>350</width>
-      <height>200</height>
-      <title>$(P)$(R)TSSigmaXY</title>
-      <x_axis>
-        <title>Time (s)</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-          </font>
-        </scale_font>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
         <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>Value</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>$(traces[0].y_pv)</name>
-          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSSigmaXY</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="75" green="110" blue="199">
-            </color>
-          </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
-    </widget>
-    <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #57</name>
-      <y>205</y>
-      <width>350</width>
-      <height>200</height>
-      <title>$(P)$(R)TSSkewX</title>
-      <x_axis>
-        <title>Time (s)</title>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>780</x>
+    <y>80</y>
+    <width>350</width>
+    <height>200</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(R)TSCentroidY</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <x_axis>
+      <title>Time (s)</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Value</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>Value</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>$(traces[0].y_pv)</name>
-          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSSkewX</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="75" green="110" blue="199">
-            </color>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+        <y_pv>$(P)$(R)TSCentroidY</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
           </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
-    </widget>
-    <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #64</name>
-      <x>355</x>
-      <y>205</y>
-      <width>350</width>
-      <height>200</height>
-      <title>$(P)$(R)TSSkewY</title>
-      <x_axis>
-        <title>Time (s)</title>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_14</name>
+    <text>Acquire:</text>
+    <x>101</x>
+    <y>100</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>Status:</text>
+    <x>86</x>
+    <y>134</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Number of points:</text>
+    <x>32</x>
+    <y>162</y>
+    <width>125</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_17</name>
+    <text>Current point:</text>
+    <x>26</x>
+    <y>191</y>
+    <width>130</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_18</name>
+    <text>Read rate:</text>
+    <x>67</x>
+    <y>221</y>
+    <width>90</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>AcquireMode:</text>
+    <x>47</x>
+    <y>251</y>
+    <width>110</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(P)$(R)TS:TSAcquiring</pv_name>
+    <x>171</x>
+    <y>134</y>
+    <width>85</width>
+    <height>18</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>6</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
+        <value>2</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
+    <text>Stop</text>
+    <x>277</x>
+    <y>100</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_2</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
+    <text>Erase/Start</text>
+    <x>171</x>
+    <y>100</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(R)TS:TSNumPoints</pv_name>
+    <x>171</x>
+    <y>162</y>
+    <width>85</width>
+    <height>19</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(P)$(R)TS:TSCurrentPoint</pv_name>
+    <x>171</x>
+    <y>191</y>
+    <width>85</width>
+    <height>18</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button</name>
+    <pv_name>$(P)$(R)TS:TSRead.SCAN</pv_name>
+    <x>171</x>
+    <y>221</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
+    <text>Read</text>
+    <x>277</x>
+    <y>221</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button</name>
+    <pv_name>$(P)$(R)TS:TSAcquireMode</pv_name>
+    <x>171</x>
+    <y>251</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>NDPluginTimeSeries.opi</file>
+        <macros>
+          <R>$(R)TS:</R>
+        </macros>
+        <target>tab</target>
+        <description>Time series control</description>
+      </action>
+    </actions>
+    <text>More</text>
+    <x>277</x>
+    <y>251</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>1150</x>
+    <y>80</y>
+    <width>350</width>
+    <height>200</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(R)TSCentroidTotal</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <x_axis>
+      <title>Time (s)</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Value</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
-      </x_axis>
-      <y_axes>
-        <y_axis>
-          <title>Value</title>
-          <autoscale>true</autoscale>
-          <log_scale>false</log_scale>
-          <minimum>0.0</minimum>
-          <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
-          <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-            </font>
-          </title_font>
-          <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-            </font>
-          </scale_font>
-          <visible>true</visible>
-        </y_axis>
-      </y_axes>
-      <traces>
-        <trace>
-          <name>$(traces[0].y_pv)</name>
-          <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSSkewY</y_pv>
-          <err_pv></err_pv>
-          <axis>0</axis>
-          <trace_type>1</trace_type>
-          <color>
-            <color red="75" green="110" blue="199">
-            </color>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+        <y_pv>$(P)$(R)TSCentroidTotal</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
           </color>
-          <line_width>1</line_width>
-          <line_style>0</line_style>
-          <point_type>0</point_type>
-          <point_size>10</point_size>
-          <visible>true</visible>
-        </trace>
-      </traces>
-    </widget>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_4</name>
+    <x>20</x>
+    <y>560</y>
+    <width>1560</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #71</name>
-      <x>710</x>
-      <y>205</y>
+      <name>XY Graph</name>
+      <x>1131</x>
+      <y>10</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSKurtosisX</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSKurtosisY</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -577,13 +989,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -593,7 +1005,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSKurtosisX</y_pv>
+          <y_pv>$(P)$(R)TSKurtosisY</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -604,31 +1016,66 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_33</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #78</name>
-      <x>1065</x>
-      <y>205</y>
+      <name>XY Graph</name>
+      <x>755</x>
+      <y>10</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSKurtosisY</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSKurtosisX</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -640,13 +1087,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -656,7 +1103,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSKurtosisY</y_pv>
+          <y_pv>$(P)$(R)TSKurtosisX</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -667,31 +1114,46 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #85</name>
-      <x>710</x>
-      <y>410</y>
+      <name>XY Graph</name>
+      <x>387</x>
+      <y>10</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSEccentricity</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSSkewY</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -703,13 +1165,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -719,7 +1181,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSEccentricity</y_pv>
+          <y_pv>$(P)$(R)TSSkewY</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -730,31 +1192,46 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
     <widget type="xyplot" version="2.0.0">
-      <name>cartesian plot #92</name>
-      <x>1065</x>
-      <y>410</y>
+      <name>XY Graph</name>
+      <x>19</x>
+      <y>10</y>
       <width>350</width>
       <height>200</height>
-      <title>$(P)$(R)TSOrientation</title>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="240" green="240" blue="240">
+        </color>
+      </background_color>
+      <title>$(P)$(R)TSSkewX</title>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <show_toolbar>true</show_toolbar>
+      <actions>
+      </actions>
       <x_axis>
         <title>Time (s)</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -766,13 +1243,13 @@
           <log_scale>false</log_scale>
           <minimum>0.0</minimum>
           <maximum>100.0</maximum>
-          <show_grid>false</show_grid>
+          <show_grid>true</show_grid>
           <title_font>
-            <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+            <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
             </font>
           </title_font>
           <scale_font>
-            <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+            <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
             </font>
           </scale_font>
           <visible>true</visible>
@@ -782,7 +1259,7 @@
         <trace>
           <name>$(traces[0].y_pv)</name>
           <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
-          <y_pv>$(P)$(R)TSOrientation</y_pv>
+          <y_pv>$(P)$(R)TSSkewX</y_pv>
           <err_pv></err_pv>
           <axis>0</axis>
           <trace_type>1</trace_type>
@@ -793,245 +1270,198 @@
           <line_width>1</line_width>
           <line_style>0</line_style>
           <point_type>0</point_type>
-          <point_size>10</point_size>
+          <point_size>4</point_size>
           <visible>true</visible>
         </trace>
       </traces>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>composite #99</name>
+    <name>BGGrey02_5</name>
     <x>20</x>
-    <y>655</y>
-    <width>325</width>
-    <height>120</height>
+    <y>802</y>
+    <width>1560</width>
+    <height>220</height>
     <style>3</style>
-    <transparent>true</transparent>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
     <widget type="label" version="2.0.0">
-      <name>text #102</name>
-      <text>Current point</text>
-      <x>35</x>
-      <y>50</y>
-      <width>130</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #105</name>
-      <pv_name>$(P)$(R)TS:TSCurrentPoint</pv_name>
-      <x>170</x>
-      <y>51</y>
-      <width>90</width>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <name>Label_34</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
         </font>
       </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
         </color>
       </foreground_color>
-      <background_color>
-        <color red="187" green="187" blue="187">
-        </color>
-      </background_color>
-      <format>1</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="combo" version="2.0.0">
-      <name>menu #109</name>
-      <pv_name>$(P)$(R)TS:TSRead.SCAN</pv_name>
-      <x>150</x>
-      <y>75</y>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>message button #112</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
-          <value>1</value>
-          <description>Write</description>
-        </action>
-      </actions>
-      <pv_name>$(P)$(R)TS:TSRead.PROC</pv_name>
-      <text>Read</text>
-      <x>255</x>
-      <y>75</y>
-      <width>70</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #115</name>
-      <text>Read rate</text>
-      <x>55</x>
-      <y>75</y>
-      <width>90</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
       <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>text entry #118</name>
-      <pv_name>$(P)$(R)TS:TSNumPoints</pv_name>
-      <x>170</x>
-      <y>26</y>
-      <width>60</width>
-      <height>19</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>775</x>
+    <y>812</y>
+    <width>723</width>
+    <height>200</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(R)TSOrientation</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-      <format>1</format>
-      <show_units>false</show_units>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #122</name>
-      <text>Number of points</text>
-      <x>5</x>
-      <y>25</y>
-      <width>160</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <x_axis>
+      <title>Time (s)</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
-      </font>
-      <horizontal_alignment>2</horizontal_alignment>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>message button #125</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
-          <value>1</value>
-          <description>Write</description>
-        </action>
-      </actions>
-      <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
-      <text>Erase/Start</text>
-      <x>75</x>
-      <width>90</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>message button #128</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
-          <value>2</value>
-          <description>Write</description>
-        </action>
-      </actions>
-      <pv_name>$(P)$(R)TS:TSAcquire</pv_name>
-      <text>Stop</text>
-      <x>170</x>
-      <width>60</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #131</name>
-      <pv_name>$(P)$(R)TS:TSAcquiring</pv_name>
-      <x>235</x>
-      <y>1</y>
-      <width>90</width>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
         </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="70" green="70" blue="70">
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Value</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+        <y_pv>$(P)$(R)TSOrientation</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
+          </color>
         </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #135</name>
-      <text>Acquire</text>
-      <width>70</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph</name>
+    <x>39</x>
+    <y>812</y>
+    <width>718</width>
+    <height>200</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(R)TSEccentricity</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
-      <auto_size>true</auto_size>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>related display #138</name>
-      <actions>
-        <action type="open_display">
-          <file>NDPluginTimeSeries.opi</file>
-          <macros>
-            <R>$(R)TS:</R>
-          </macros>
-          <target>tab</target>
-          <description>Time series control</description>
-        </action>
-      </actions>
-      <text>More</text>
-      <x>255</x>
-      <y>100</y>
-      <width>70</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #141</name>
-      <text>AcquireMode</text>
-      <x>35</x>
-      <y>99</y>
-      <width>110</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <x_axis>
+      <title>Time (s)</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
-      </font>
-      <auto_size>true</auto_size>
-    </widget>
-    <widget type="combo" version="2.0.0">
-      <name>menu #144</name>
-      <pv_name>$(P)$(R)TS:TSAcquireMode</pv_name>
-      <x>150</x>
-      <y>99</y>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>Value</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <x_pv>$(P)$(R)TS:TSTimeAxis</x_pv>
+        <y_pv>$(P)$(R)TSEccentricity</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
+          </color>
         </color>
-      </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
-    </widget>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
   </widget>
 </display>
diff --git a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
index ef7523d10dc34060668bfef42e1152e4296dbc80..a22a963791b8f3a397a0576741570e742f693d82 100644
--- a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
+++ b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
@@ -1,54 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>NDStatsTimeSeriesPlot</name>
+  <name>NDTimeSeriesPlot</name>
   <x>370</x>
   <y>223</y>
-  <width>500</width>
-  <height>415</height>
+  <width>700</width>
+  <height>700</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <x>10</x>
+    <y>60</y>
+    <width>680</width>
+    <height>550</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
   <widget type="xyplot" version="2.0.0">
-    <name>cartesian plot #6</name>
-    <x>5</x>
-    <y>55</y>
-    <width>490</width>
-    <height>275</height>
-    <title>$(P)$(RN) Time Series</title>
+    <name>XY Graph</name>
+    <x>30</x>
+    <y>270</y>
+    <width>590</width>
+    <height>280</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title>$(P)$(RN)TimeSeries</title>
+    <title_font>
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
     <x_axis>
       <title>Time (s)</title>
       <autoscale>true</autoscale>
       <log_scale>false</log_scale>
       <minimum>0.0</minimum>
       <maximum>100.0</maximum>
-      <show_grid>false</show_grid>
+      <show_grid>true</show_grid>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
       <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
         </font>
       </scale_font>
       <visible>true</visible>
     </x_axis>
     <y_axes>
       <y_axis>
-        <title>$(P)$(RN)</title>
+        <title>$(P)$(RN)TimeSeries</title>
         <autoscale>true</autoscale>
         <log_scale>false</log_scale>
         <minimum>0.0</minimum>
         <maximum>100.0</maximum>
-        <show_grid>false</show_grid>
+        <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -58,7 +90,7 @@
       <trace>
         <name>$(traces[0].y_pv)</name>
         <x_pv>$(P)$(R)TSTimeAxis</x_pv>
-        <y_pv>$(P)$(RN)</y_pv>
+        <y_pv>$(P)$(RN)TimeSeries</y_pv>
         <err_pv></err_pv>
         <axis>0</axis>
         <trace_type>1</trace_type>
@@ -69,243 +101,457 @@
         <line_width>1</line_width>
         <line_style>0</line_style>
         <point_type>0</point_type>
-        <point_size>10</point_size>
+        <point_size>4</point_size>
         <visible>true</visible>
       </trace>
     </traces>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #13</name>
-    <y>5</y>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Acquire:</text>
+    <x>90</x>
+    <y>80</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(P)$(R)TSAcquire</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)TSAcquire</pv_name>
+    <text>Erase/Start</text>
+    <x>185</x>
+    <y>80</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(P)$(R)TSAcquire</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)TSAcquire</pv_name>
+    <text>Stop</text>
+    <x>275</x>
+    <y>80</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(P)$(R)TSAcquiring</pv_name>
+    <x>390</x>
+    <y>80</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>6</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>$(P)$(RN)</text>
+    <y>30</y>
     <width>500</width>
-    <height>45</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>text #16</name>
-      <text>$(P)$(RN)</text>
-      <width>500</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-    <widget type="textupdate" version="2.0.0">
-      <name>text update #19</name>
-      <pv_name>$(P)$(R)TSAcquiring</pv_name>
-      <x>282</x>
-      <y>26</y>
-      <height>18</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="10" green="0" blue="184">
-        </color>
-      </foreground_color>
-      <background_color>
-        <color red="70" green="70" blue="70">
-        </color>
-      </background_color>
-      <format>6</format>
-      <show_units>false</show_units>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>message button #23</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>$(P)$(R)TSAcquire</pv_name>
-          <value>0</value>
-          <description>Write</description>
-        </action>
-      </actions>
-      <pv_name>$(P)$(R)TSAcquire</pv_name>
-      <text>Stop</text>
-      <x>191</x>
-      <y>25</y>
-      <width>85</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>message button #26</name>
-      <actions>
-        <action type="write_pv">
-          <pv_name>$(P)$(R)TSAcquire</pv_name>
-          <value>1</value>
-          <description>Write</description>
-        </action>
-      </actions>
-      <pv_name>$(P)$(R)TSAcquire</pv_name>
-      <text>Erase/Start</text>
-      <x>101</x>
-      <y>25</y>
-      <width>85</width>
-      <height>20</height>
-      <background_color>
-        <color red="115" green="223" blue="255">
-        </color>
-      </background_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #29</name>
-      <text>Acquire</text>
-      <x>26</x>
-      <y>25</y>
-      <width>70</width>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="16.0">
-        </font>
-      </font>
-      <auto_size>true</auto_size>
-    </widget>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Signal name:</text>
+    <x>382</x>
+    <y>186</y>
+    <width>110</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(RN)Name</pv_name>
+    <x>510</x>
+    <y>186</y>
+    <width>85</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Avg.time:</text>
+    <x>80</x>
+    <y>185</y>
+    <width>80</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(R)TSAveragingTime</pv_name>
+    <x>185</x>
+    <y>185</y>
+    <width>85</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>2</format>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(P)$(R)TSAveragingTime_RBV</pv_name>
+    <x>275</x>
+    <y>185</y>
+    <width>85</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>2</format>
+    <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #32</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TSAcquireMode</pv_name>
-    <x>395</x>
-    <y>340</y>
+    <x>510</x>
+    <y>115</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #35</name>
-    <text>AcquireMode</text>
-    <x>280</x>
-    <y>340</y>
+    <name>Label</name>
+    <text>AcquireMode:</text>
+    <x>382</x>
+    <y>115</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #38</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R)TSRead</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R)TSRead</pv_name>
     <text>Read</text>
-    <x>190</x>
-    <y>340</y>
-    <width>67</width>
+    <x>275</x>
+    <y>115</y>
+    <width>85</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #41</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R)TSRead.SCAN</pv_name>
-    <x>105</x>
-    <y>341</y>
-    <width>80</width>
-    <height>18</height>
+    <x>185</x>
+    <y>115</y>
+    <width>85</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #44</name>
-    <text>Read rate</text>
-    <x>10</x>
-    <y>340</y>
+    <name>Label</name>
+    <text>Read rate:</text>
+    <x>70</x>
+    <y>115</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #47</name>
-    <text>Number of points</text>
-    <x>10</x>
-    <y>365</y>
+    <name>Label</name>
+    <text>Number of points:</text>
+    <y>150</y>
     <width>160</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #50</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)TSNumPoints</pv_name>
-    <x>175</x>
-    <y>366</y>
-    <width>60</width>
-    <height>19</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>185</x>
+    <y>150</y>
+    <width>85</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #54</name>
-    <text>Current point</text>
-    <x>270</x>
-    <y>365</y>
+    <name>Label</name>
+    <text>Current point:</text>
+    <x>360</x>
+    <y>150</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #57</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)TSCurrentPoint</pv_name>
-    <x>405</x>
-    <y>366</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>510</x>
+    <y>150</y>
+    <width>85</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #61</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>NDPluginTimeSeries.opi</file>
@@ -314,12 +560,51 @@
       </action>
     </actions>
     <text>More</text>
-    <x>10</x>
-    <y>390</y>
+    <x>185</x>
+    <y>223</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>690</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>TITLE</class>
+    <text>$(P)$(RN)Name</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>390</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>
diff --git a/99-Shared/admisc/NDProcess.bob b/99-Shared/admisc/NDProcess.bob
index 72208c9452844450c0920efd6ccc491d022cadd3..19f8ab94996a4c62cad97f3d7c9d7f4cdb6fc3aa 100644
--- a/99-Shared/admisc/NDProcess.bob
+++ b/99-Shared/admisc/NDProcess.bob
@@ -3,154 +3,445 @@
   <name>NDProcess</name>
   <x>10</x>
   <y>31</y>
-  <width>1150</width>
-  <height>660</height>
+  <width>1400</width>
+  <height>1000</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <y>9</y>
-    <width>1150</width>
-    <height>26</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
-      </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>390</x>
-    <y>40</y>
-    <width>350</width>
-    <height>570</height>
-    <line_width>1</line_width>
+    <name>BGGrey02-background_1</name>
+    <x>784</x>
+    <y>69</y>
+    <width>506</width>
+    <height>713</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_8</name>
+    <x>800</x>
+    <y>547</y>
+    <width>442</width>
+    <height>223</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_36</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>On filter reset:</text>
+      <x>15</x>
+      <y>76</y>
+      <width>112</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>F[0] = ROffset + RC1*F[n] + RC2*I[0]</text>
+      <x>15</x>
+      <y>95</y>
+      <width>252</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>I = Input array in callback</text>
+      <x>15</x>
+      <y>119</y>
+      <width>189</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>F = Stored filter (double precision)</text>
+      <x>15</x>
+      <y>138</y>
+      <width>252</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>N = value of NumFiltered</text>
+      <x>15</x>
+      <y>157</y>
+      <width>168</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>O = Output array passed to clients</text>
+      <x>15</x>
+      <y>176</y>
+      <width>238</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_7</name>
+    <x>800</x>
+    <y>313</y>
+    <width>442</width>
+    <height>212</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_35</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_6</name>
+    <x>800</x>
+    <y>99</y>
+    <width>442</width>
+    <height>190</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_34</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>792</x>
-    <y>42</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
+    <name>BGGrey02-background</name>
+    <x>400</x>
+    <y>69</y>
+    <width>370</width>
+    <height>713</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="128" green="0" blue="255">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>745</x>
-    <y>40</y>
-    <width>400</width>
-    <height>615</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_5</name>
+    <x>420</x>
+    <y>712</y>
+    <width>333</width>
+    <height>41</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)DataTypeOut_RBV</pv_name>
+      <x>231</x>
+      <y>12</y>
+      <width>62</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="combo" version="2.0.0">
+      <name>Menu Button</name>
+      <pv_name>$(P)$(R)DataTypeOut</pv_name>
+      <x>145</x>
+      <y>12</y>
+      <width>80</width>
+      <height>20</height>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Data type:</text>
+      <x>44</x>
+      <y>11</y>
+      <width>90</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_4</name>
+    <x>420</x>
+    <y>550</y>
+    <width>333</width>
+    <height>118</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>437</x>
-    <y>42</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_3</name>
+    <x>420</x>
+    <y>391</y>
+    <width>333</width>
+    <height>115</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>442</x>
-    <y>560</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_2</name>
+    <x>420</x>
+    <y>228</y>
+    <width>333</width>
+    <height>123</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>442</x>
-    <y>425</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>420</x>
+    <y>99</y>
+    <width>333</width>
+    <height>90</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <x>437</x>
-    <y>155</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1400</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
       <color red="128" green="0" blue="255">
       </color>
     </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>442</x>
-    <y>290</y>
-    <width>280</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
-    </line_color>
+    </background_color>
     <actions>
     </actions>
     <tooltip>$(pv_name)
@@ -159,8 +450,8 @@ $(pv_value)</tooltip>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <file>../adcore/NDPluginBase.opi</file>
-    <x>5</x>
-    <y>40</y>
+    <x>10</x>
+    <y>69</y>
     <width>380</width>
     <height>555</height>
     <actions>
@@ -172,45 +463,28 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>10</y>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
     <width>1150</width>
-    <height>25</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Recursive filter</text>
-    <x>852</x>
-    <y>42</y>
-    <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -221,20 +495,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableFilter_RBV</pv_name>
-    <x>1023</x>
-    <y>71</y>
+    <x>1067</x>
+    <y>109</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -252,14 +521,23 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable filter</text>
-    <x>796</x>
-    <y>70</y>
+    <text>Enable filter:</text>
+    <x>840</x>
+    <y>108</y>
     <width>130</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -272,12 +550,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableFilter</pv_name>
-    <x>937</x>
-    <y>71</y>
+    <x>981</x>
+    <y>109</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -285,20 +567,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)NumFilter_RBV</pv_name>
-    <x>1023</x>
-    <y>96</y>
+    <x>1067</x>
+    <y>134</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -315,16 +592,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)NumFilter</pv_name>
-    <x>937</x>
-    <y>96</y>
+    <x>981</x>
+    <y>134</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -339,14 +615,22 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>N filter</text>
-    <x>846</x>
-    <y>95</y>
+    <text>N filter:</text>
+    <x>890</x>
+    <y>133</y>
     <width>80</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -359,13 +643,21 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>N filtered</text>
-    <x>826</x>
-    <y>120</y>
+    <text>N filtered:</text>
+    <x>870</x>
+    <y>158</y>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -379,20 +671,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)NumFiltered_RBV</pv_name>
-    <x>937</x>
-    <y>121</y>
+    <x>981</x>
+    <y>159</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -408,14 +695,22 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Filter type</text>
-    <x>816</x>
-    <y>145</y>
+    <text>Filter type:</text>
+    <x>860</x>
+    <y>183</y>
     <width>110</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -429,26 +724,38 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)FilterType</pv_name>
-    <x>937</x>
-    <y>146</y>
+    <x>981</x>
+    <y>184</y>
     <width>140</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Reset filter</text>
-    <x>806</x>
-    <y>170</y>
+    <text>Reset filter:</text>
+    <x>850</x>
+    <y>208</y>
     <width>120</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -469,146 +776,33 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)ResetFilter</pv_name>
     <text>Reset</text>
-    <x>937</x>
-    <y>171</y>
+    <x>981</x>
+    <y>209</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>On filter reset:</text>
-    <x>755</x>
-    <y>531</y>
-    <width>112</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>(OC3+OC4/N)*I[n])</text>
-    <x>755</x>
-    <y>474</y>
+    <text></text>
+    <x>800</x>
+    <y>566</y>
     <width>294</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>(FC3+FC4/N)*I[n])</text>
-    <x>755</x>
-    <y>512</y>
-    <width>294</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>N = value of NumFiltered</text>
-    <x>755</x>
-    <y>612</y>
-    <width>168</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>F = Stored filter (double precision)</text>
-    <x>755</x>
-    <y>593</y>
-    <width>252</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>I = Input array in callback</text>
-    <x>755</x>
-    <y>574</y>
-    <width>189</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>O = Output array passed to clients</text>
-    <x>755</x>
-    <y>631</y>
-    <width>238</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
+    </background_color>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -621,16 +815,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OOffset</pv_name>
-    <x>825</x>
-    <y>246</y>
+    <x>857</x>
+    <y>319</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -646,20 +839,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OOffset_RBV</pv_name>
-    <x>880</x>
-    <y>246</y>
+    <x>912</x>
+    <y>319</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -676,16 +864,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OC1</pv_name>
-    <x>825</x>
-    <y>271</y>
+    <x>857</x>
+    <y>344</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -701,20 +888,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OC1_RBV</pv_name>
-    <x>880</x>
-    <y>271</y>
+    <x>912</x>
+    <y>344</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -730,14 +912,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>OC2</text>
-    <x>988</x>
-    <y>270</y>
+    <text>OC2:</text>
+    <x>1020</x>
+    <y>343</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -751,16 +937,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OC2</pv_name>
-    <x>1021</x>
-    <y>271</y>
+    <x>1053</x>
+    <y>344</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -776,20 +961,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OC2_RBV</pv_name>
-    <x>1076</x>
-    <y>271</y>
+    <x>1108</x>
+    <y>344</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -806,16 +986,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OC3</pv_name>
-    <x>825</x>
-    <y>296</y>
+    <x>857</x>
+    <y>369</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -831,20 +1010,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OC3_RBV</pv_name>
-    <x>880</x>
-    <y>296</y>
+    <x>912</x>
+    <y>369</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -860,14 +1034,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>OC4</text>
-    <x>988</x>
-    <y>295</y>
+    <text>OC4:</text>
+    <x>1020</x>
+    <y>368</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -881,16 +1059,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OC4</pv_name>
-    <x>1021</x>
-    <y>296</y>
+    <x>1053</x>
+    <y>369</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -906,20 +1083,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OC4_RBV</pv_name>
-    <x>1076</x>
-    <y>296</y>
+    <x>1108</x>
+    <y>369</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -936,16 +1108,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)ROffset</pv_name>
-    <x>825</x>
-    <y>396</y>
+    <x>857</x>
+    <y>469</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -961,20 +1132,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ROffset_RBV</pv_name>
-    <x>880</x>
-    <y>396</y>
+    <x>912</x>
+    <y>469</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -991,16 +1157,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FOffset</pv_name>
-    <x>825</x>
-    <y>321</y>
+    <x>857</x>
+    <y>394</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1016,20 +1181,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FOffset_RBV</pv_name>
-    <x>880</x>
-    <y>321</y>
+    <x>912</x>
+    <y>394</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1046,16 +1206,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FC1</pv_name>
-    <x>825</x>
-    <y>346</y>
+    <x>857</x>
+    <y>419</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1071,20 +1230,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FC1_RBV</pv_name>
-    <x>880</x>
-    <y>346</y>
+    <x>912</x>
+    <y>419</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1100,14 +1254,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FC2</text>
-    <x>988</x>
-    <y>345</y>
+    <text>FC2:</text>
+    <x>1020</x>
+    <y>418</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1121,16 +1279,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FC2</pv_name>
-    <x>1021</x>
-    <y>346</y>
+    <x>1053</x>
+    <y>419</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1146,20 +1303,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FC2_RBV</pv_name>
-    <x>1076</x>
-    <y>346</y>
+    <x>1108</x>
+    <y>419</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1176,16 +1328,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FC3</pv_name>
-    <x>825</x>
-    <y>371</y>
+    <x>857</x>
+    <y>444</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1201,20 +1352,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FC3_RBV</pv_name>
-    <x>880</x>
-    <y>371</y>
+    <x>912</x>
+    <y>444</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1230,14 +1376,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FC4</text>
-    <x>988</x>
-    <y>370</y>
+    <text>FC4:</text>
+    <x>1020</x>
+    <y>443</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1251,16 +1401,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FC4</pv_name>
-    <x>1021</x>
-    <y>371</y>
+    <x>1053</x>
+    <y>444</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1276,20 +1425,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FC4_RBV</pv_name>
-    <x>1076</x>
-    <y>371</y>
+    <x>1108</x>
+    <y>444</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1305,14 +1449,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>OScale</text>
-    <x>958</x>
-    <y>245</y>
+    <text>OScale:</text>
+    <x>990</x>
+    <y>318</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1325,16 +1474,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)OScale</pv_name>
-    <x>1021</x>
-    <y>246</y>
+    <x>1053</x>
+    <y>319</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1350,20 +1498,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)OScale_RBV</pv_name>
-    <x>1076</x>
-    <y>246</y>
+    <x>1108</x>
+    <y>319</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1379,14 +1522,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FScale</text>
-    <x>958</x>
-    <y>320</y>
+    <text>FScale:</text>
+    <x>990</x>
+    <y>393</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1399,16 +1547,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)FScale</pv_name>
-    <x>1021</x>
-    <y>321</y>
+    <x>1053</x>
+    <y>394</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1424,20 +1571,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)FScale_RBV</pv_name>
-    <x>1076</x>
-    <y>321</y>
+    <x>1108</x>
+    <y>394</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1453,35 +1595,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>F[n] = FOffset + FScale*((FC1+FC2/N)*F[n-1] +</text>
-    <x>755</x>
-    <y>493</y>
-    <width>315</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <text>F[n] = FOffset + FScale*((FC1+FC2/N)*F[n-1] + (FC3+FC4/N)*I[n])</text>
+    <x>802</x>
+    <y>579</y>
+    <width>440</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>O[n] = OOffset + OScale*((OC1+OC2/N)*F[n-1] +</text>
-    <x>755</x>
-    <y>455</y>
-    <width>322</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1493,15 +1618,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>F[0] = ROffset + RC1*F[n] + RC2*I[0]</text>
-    <x>755</x>
-    <y>550</y>
-    <width>252</width>
-    <height>14</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="7.920792079207921">
-      </font>
-    </font>
+    <text>O[n] = OOffset + OScale*((OC1+OC2/N)*F[n-1] + (OC3+OC4/N)*I[n])</text>
+    <x>800</x>
+    <y>547</y>
+    <width>470</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1514,16 +1642,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)RC1</pv_name>
-    <x>825</x>
-    <y>421</y>
+    <x>857</x>
+    <y>494</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1539,20 +1666,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)RC1_RBV</pv_name>
-    <x>880</x>
-    <y>421</y>
+    <x>912</x>
+    <y>494</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1568,14 +1690,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>RC2</text>
-    <x>988</x>
-    <y>420</y>
+    <text>RC2:</text>
+    <x>1020</x>
+    <y>493</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1589,16 +1715,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)RC2</pv_name>
-    <x>1021</x>
-    <y>421</y>
+    <x>1053</x>
+    <y>494</y>
     <width>50</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1614,20 +1739,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)RC2_RBV</pv_name>
-    <x>1076</x>
-    <y>421</y>
+    <x>1108</x>
+    <y>494</y>
     <width>60</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1643,14 +1763,22 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Auto reset filter</text>
-    <x>756</x>
-    <y>195</y>
+    <text>Auto reset filter:</text>
+    <x>800</x>
+    <y>233</y>
     <width>170</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1664,26 +1792,38 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)AutoResetFilter</pv_name>
-    <x>937</x>
-    <y>196</y>
+    <x>981</x>
+    <y>234</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Filter callbacks</text>
-    <x>766</x>
-    <y>220</y>
+    <text>Filter callbacks:</text>
+    <x>810</x>
+    <y>258</y>
     <width>160</width>
     <font>
       <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1697,26 +1837,35 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)FilterCallbacks</pv_name>
-    <x>937</x>
-    <y>221</y>
+    <x>981</x>
+    <y>259</y>
     <width>140</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable background</text>
-    <x>401</x>
-    <y>95</y>
+    <text>Enable background:</text>
+    <x>410</x>
+    <y>132</y>
     <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1729,20 +1878,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableBackground_RBV</pv_name>
-    <x>668</x>
-    <y>96</y>
+    <x>677</x>
+    <y>133</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -1761,109 +1905,34 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableBackground</pv_name>
-    <x>582</x>
-    <y>96</y>
+    <x>591</x>
+    <y>133</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Background subtraction</text>
-    <x>467</x>
-    <y>42</y>
-    <width>220</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>OOffset:</text>
+    <x>784</x>
+    <y>318</y>
+    <width>70</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>OOffset</text>
-    <x>752</x>
-    <y>245</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>OC1</text>
-    <x>792</x>
-    <y>270</y>
-    <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>OC3</text>
-    <x>792</x>
-    <y>295</y>
-    <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>ROffset</text>
-    <x>752</x>
-    <y>395</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1876,14 +1945,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FOffset</text>
-    <x>752</x>
-    <y>320</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>OC1:</text>
+    <x>824</x>
+    <y>343</y>
+    <width>30</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1895,14 +1969,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FC1</text>
-    <x>792</x>
-    <y>345</y>
+    <text>OC3:</text>
+    <x>824</x>
+    <y>368</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1915,14 +1993,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>FC3</text>
-    <x>792</x>
-    <y>370</y>
-    <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>ROffset:</text>
+    <x>784</x>
+    <y>468</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1935,14 +2017,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>RC1</text>
-    <x>792</x>
-    <y>420</y>
-    <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>FOffset:</text>
+    <x>784</x>
+    <y>393</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1955,14 +2041,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Data type</text>
-    <x>473</x>
-    <y>585</y>
-    <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>FC1:</text>
+    <x>824</x>
+    <y>418</y>
+    <width>30</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1973,41 +2063,21 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="combo" version="2.0.0">
-    <name>Menu Button</name>
-    <pv_name>$(P)$(R)DataTypeOut</pv_name>
-    <x>574</x>
-    <y>586</y>
-    <width>80</width>
-    <height>18</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)DataTypeOut_RBV</pv_name>
-    <x>660</x>
-    <y>586</y>
-    <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>FC3:</text>
+    <x>824</x>
+    <y>443</y>
+    <width>30</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2019,19 +2089,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Output data type</text>
-    <x>502</x>
-    <y>560</y>
-    <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>RC1:</text>
+    <x>824</x>
+    <y>493</y>
+    <width>30</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2043,14 +2113,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable low clip</text>
-    <x>421</x>
-    <y>450</y>
+    <text>Enable low clip:</text>
+    <x>433</x>
+    <y>562</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2064,20 +2138,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableLowClip_RBV</pv_name>
-    <x>668</x>
-    <y>451</y>
+    <x>680</x>
+    <y>563</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2095,14 +2164,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Low clip value</text>
-    <x>431</x>
-    <y>475</y>
+    <text>Low clip value:</text>
+    <x>443</x>
+    <y>587</y>
     <width>140</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2116,20 +2189,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)LowClip_RBV</pv_name>
-    <x>668</x>
-    <y>476</y>
+    <x>680</x>
+    <y>588</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2146,14 +2214,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable high clip</text>
-    <x>411</x>
-    <y>500</y>
+    <text>Enable high clip:</text>
+    <x>423</x>
+    <y>612</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2167,20 +2239,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableHighClip_RBV</pv_name>
-    <x>668</x>
-    <y>501</y>
+    <x>680</x>
+    <y>613</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2199,20 +2266,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)HighClip_RBV</pv_name>
-    <x>668</x>
-    <y>525</y>
+    <x>680</x>
+    <y>637</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2229,14 +2291,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>High clip value</text>
-    <x>421</x>
-    <y>525</y>
+    <text>High clip value:</text>
+    <x>433</x>
+    <y>637</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2250,12 +2316,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableLowClip</pv_name>
-    <x>582</x>
-    <y>451</y>
+    <x>594</x>
+    <y>563</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2263,16 +2333,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)LowClip</pv_name>
-    <x>582</x>
-    <y>476</y>
+    <x>594</x>
+    <y>588</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2288,12 +2357,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableHighClip</pv_name>
-    <x>582</x>
-    <y>501</y>
+    <x>594</x>
+    <y>613</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2301,16 +2374,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)HighClip</pv_name>
-    <x>582</x>
-    <y>525</y>
+    <x>594</x>
+    <y>637</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2325,38 +2397,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Low/High Clipping</text>
-    <x>497</x>
-    <y>425</y>
-    <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Save flat field:</text>
+    <x>434</x>
+    <y>243</y>
+    <width>150</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Save flat field</text>
-    <x>421</x>
-    <y>180</y>
-    <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2370,20 +2422,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ValidFlatField_RBV</pv_name>
-    <x>668</x>
-    <y>181</y>
+    <x>681</x>
+    <y>244</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2399,14 +2446,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable flat field</text>
-    <x>401</x>
-    <y>205</y>
+    <text>Enable flat field:</text>
+    <x>414</x>
+    <y>269</y>
     <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2420,20 +2471,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableFlatField_RBV</pv_name>
-    <x>668</x>
-    <y>206</y>
+    <x>681</x>
+    <y>269</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2451,14 +2497,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Scale flat field</text>
-    <x>411</x>
-    <y>230</y>
+    <text>Scale flat field:</text>
+    <x>424</x>
+    <y>294</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2472,20 +2522,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ScaleFlatField_RBV</pv_name>
-    <x>668</x>
-    <y>231</y>
+    <x>681</x>
+    <y>294</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2509,41 +2554,48 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)SaveFlatField</pv_name>
     <text>Save</text>
-    <x>582</x>
-    <y>181</y>
+    <x>595</x>
+    <y>244</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableFlatField</pv_name>
-    <x>582</x>
-    <y>206</y>
+    <x>595</x>
+    <y>269</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>Text Input</name>
-    <pv_name>$(P)$(R)ScaleFlatField</pv_name>
-    <x>582</x>
-    <y>231</y>
-    <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <name>Text Input</name>
+    <pv_name>$(P)$(R)ScaleFlatField</pv_name>
+    <x>595</x>
+    <y>294</y>
+    <width>80</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2558,62 +2610,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Flat field normalization</text>
-    <x>457</x>
-    <y>155</y>
-    <width>240</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Scale and Offset</text>
-    <x>502</x>
-    <y>290</y>
-    <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Scale value:</text>
+    <x>474</x>
+    <y>451</y>
+    <width>110</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Scale value</text>
-    <x>461</x>
-    <y>365</y>
-    <width>110</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2627,20 +2635,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Scale_RBV</pv_name>
-    <x>668</x>
-    <y>366</y>
+    <x>681</x>
+    <y>452</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2658,16 +2661,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)Scale</pv_name>
-    <x>582</x>
-    <y>366</y>
+    <x>595</x>
+    <y>452</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2682,14 +2684,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Offset value</text>
-    <x>451</x>
-    <y>390</y>
+    <text>Offset value:</text>
+    <x>464</x>
+    <y>476</y>
     <width>120</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2703,16 +2709,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)Offset</pv_name>
-    <x>582</x>
-    <y>390</y>
+    <x>595</x>
+    <y>476</y>
     <width>80</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2728,20 +2733,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Offset_RBV</pv_name>
-    <x>668</x>
-    <y>390</y>
+    <x>681</x>
+    <y>476</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2758,14 +2758,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Enable scale/off.</text>
-    <x>401</x>
-    <y>315</y>
+    <text>Enable scale/off.:</text>
+    <x>414</x>
+    <y>401</y>
     <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2779,12 +2783,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)EnableOffsetScale</pv_name>
-    <x>582</x>
-    <y>316</y>
+    <x>595</x>
+    <y>402</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2792,20 +2800,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)EnableOffsetScale_RBV</pv_name>
-    <x>668</x>
-    <y>316</y>
+    <x>681</x>
+    <y>402</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2823,14 +2826,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Auto scale/off.</text>
-    <x>421</x>
-    <y>340</y>
+    <text>Auto scale/off.:</text>
+    <x>434</x>
+    <y>426</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2851,25 +2858,33 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)AutoOffsetScale</pv_name>
     <text>Auto calc</text>
-    <x>582</x>
-    <y>341</y>
+    <x>595</x>
+    <y>427</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Save background</text>
-    <x>421</x>
-    <y>70</y>
+    <text>Save background:</text>
+    <x>430</x>
+    <y>107</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2890,32 +2905,31 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)SaveBackground</pv_name>
     <text>Save</text>
-    <x>582</x>
-    <y>71</y>
+    <x>591</x>
+    <y>108</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ValidBackground_RBV</pv_name>
-    <x>668</x>
-    <y>71</y>
+    <x>677</x>
+    <y>108</y>
     <width>62</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -2931,14 +2945,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Read TIFF file</text>
-    <x>431</x>
-    <y>120</y>
+    <text>Read TIFF file:</text>
+    <x>440</x>
+    <y>157</y>
     <width>140</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2959,12 +2977,16 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)ReadBackgroundTIFFSeq.PROC</pv_name>
     <text>Read</text>
-    <x>582</x>
-    <y>121</y>
+    <x>591</x>
+    <y>158</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
@@ -2974,33 +2996,41 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDProcessTIFF.opi</file>
         <macros>
-          <R>$(R)TIFF-</R>
+          <R>$(TIFF)</R>
         </macros>
         <target>tab</target>
         <description>TIFF file setup</description>
       </action>
     </actions>
     <text>Setup</text>
-    <x>668</x>
-    <y>120</y>
-    <width>60</width>
+    <x>677</x>
+    <y>157</y>
+    <width>62</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Read TIFF file</text>
-    <x>431</x>
-    <y>255</y>
+    <text>Read TIFF file:</text>
+    <x>444</x>
+    <y>318</y>
     <width>140</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3021,12 +3051,16 @@ $(pv_value)</tooltip>
     </actions>
     <pv_name>$(P)$(R)ReadFlatFieldTIFFSeq</pv_name>
     <text>Read</text>
-    <x>582</x>
-    <y>256</y>
+    <x>595</x>
+    <y>319</y>
     <width>80</width>
-    <height>19</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
@@ -3034,23 +3068,155 @@ $(pv_value)</tooltip>
     <name>Action Button</name>
     <actions>
       <action type="open_display">
-        <file>../adcore/NDProcessTIFF.opi</file>
+        <file>NDProcessTIFF.opi</file>
         <macros>
-          <R>$(R)TIFF-</R>
+          <R>$(R)TIFF:</R>
         </macros>
         <target>tab</target>
         <description>TIFF file setup</description>
       </action>
     </actions>
     <text>Setup</text>
-    <x>668</x>
-    <y>255</y>
-    <width>60</width>
+    <x>681</x>
+    <y>318</y>
+    <width>62</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_12</name>
+    <text>Background subtraction</text>
+    <x>420</x>
+    <y>69</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_13</name>
+    <text>Flat field normalization</text>
+    <x>420</x>
+    <y>198</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_14</name>
+    <text>Scale and offset </text>
+    <x>420</x>
+    <y>356</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_15</name>
+    <text>Low/High clipping</text>
+    <x>420</x>
+    <y>517</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_17</name>
+    <text>Output data type</text>
+    <x>420</x>
+    <y>678</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_33</name>
+    <class>HEADER3</class>
+    <text></text>
+    <x>454</x>
+    <y>266</y>
+    <width>140</width>
+    <height>30</height>
+    <font use_class="true">
+      <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="Text" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_18</name>
+    <text>Recursive filter</text>
+    <x>800</x>
+    <y>69</y>
+    <width>333</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>
diff --git a/99-Shared/admisc/NDStats.bob b/99-Shared/admisc/NDStats.bob
index e0cd00fbde0b22e714b75d2962ff8161cbce9df0..2856c7d65adbc535e243ca078a6ba94d9b9a6fe3 100644
--- a/99-Shared/admisc/NDStats.bob
+++ b/99-Shared/admisc/NDStats.bob
@@ -3,189 +3,401 @@
   <name>NDStats</name>
   <x>180</x>
   <y>122</y>
-  <width>1120</width>
-  <height>675</height>
+  <width>1500</width>
+  <height>850</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
   <actions>
   </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <y>9</y>
-    <width>1120</width>
-    <height>26</height>
-    <line_width>0</line_width>
+    <name>BGGrey02-background_1</name>
+    <x>849</x>
+    <y>80</y>
+    <width>418</width>
+    <height>724</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="128" green="0" blue="255">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>390</x>
-    <y>40</y>
-    <width>360</width>
-    <height>235</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>515</x>
-    <y>44</y>
-    <width>110</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_11</name>
+    <x>869</x>
+    <y>620</y>
+    <width>379</width>
+    <height>164</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>755</x>
-    <y>40</y>
-    <width>360</width>
-    <height>200</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_10</name>
+    <x>870</x>
+    <y>110</y>
+    <width>379</width>
+    <height>209</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>880</x>
-    <y>45</y>
-    <width>110</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_8</name>
+    <x>871</x>
+    <y>361</y>
+    <width>381</width>
+    <height>209</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)HistMax_RBV</pv_name>
+      <x>247</x>
+      <y>80</y>
+      <width>90</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)HistMin_RBV</pv_name>
+      <x>247</x>
+      <y>55</y>
+      <width>90</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)HistSize_RBV</pv_name>
+      <x>247</x>
+      <y>30</y>
+      <width>90</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R)ComputeHistogram_RBV</pv_name>
+      <x>247</x>
+      <y>5</y>
+      <width>90</width>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>390</x>
-    <y>280</y>
-    <width>360</width>
-    <height>305</height>
-    <line_width>1</line_width>
+    <name>BGGrey02-background</name>
+    <x>411</x>
+    <y>80</y>
+    <width>418</width>
+    <height>724</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>515</x>
-    <y>285</y>
-    <width>110</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>755</x>
-    <y>245</y>
-    <width>360</width>
-    <height>230</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey02_1</name>
+    <x>429</x>
+    <y>361</y>
+    <width>379</width>
+    <height>312</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <transparent>true</transparent>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
+    <widget type="label" version="2.0.0">
+      <name>Label_30</name>
+      <class>HEADER3</class>
+      <text></text>
+      <x>30</x>
+      <y>40</y>
+      <width>140</width>
+      <height>30</height>
+      <font use_class="true">
+        <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+        </font>
+      </font>
+      <foreground_color use_class="true">
+        <color name="Text" red="25" green="25" blue="25">
+        </color>
+      </foreground_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Time series plots:</text>
+      <x>59</x>
+      <y>283</y>
+      <width>129</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>Menu Button</name>
+      <actions>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSCentroidTotal</RN>
+          </macros>
+          <target>tab</target>
+          <description>Total</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSCentroidY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Centroid X</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSCentroidY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Centroid Y</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSSigmaX</RN>
+          </macros>
+          <target>tab</target>
+          <description>Sigma X</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSSigmaY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Sigma Y</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSSkewX</RN>
+          </macros>
+          <target>tab</target>
+          <description>Skewness X</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSSkewY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Skewness Y</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSKurtosisX</RN>
+          </macros>
+          <target>tab</target>
+          <description>Kurtosis X</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSKurtosisY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Kurtosis Y</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSSigmaXY</RN>
+          </macros>
+          <target>tab</target>
+          <description>Sigma XY</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSEccentricity</RN>
+          </macros>
+          <target>tab</target>
+          <description>Eccentricity</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
+          <macros>
+            <R>$(R)TS-</R>
+            <RN>$(R)TSOrientation</RN>
+          </macros>
+          <target>tab</target>
+          <description>Orientation</description>
+        </action>
+        <action type="open_display">
+          <file>../adcore/NDStatsTimeSeriesCentroidAll.opi</file>
+          <target>tab</target>
+          <description>All</description>
+        </action>
+      </actions>
+      <text>Menu Button Label</text>
+      <x>198</x>
+      <y>284</y>
+      <width>60</width>
+      <height>20</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>882</x>
-    <y>247</y>
-    <width>107</width>
-    <height>21</height>
-    <line_width>0</line_width>
-    <line_color>
-      <color red="128" green="0" blue="255">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_6</name>
+    <x>429</x>
+    <y>111</y>
+    <width>379</width>
+    <height>209</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
-    </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+    </background_color>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <x>875</x>
-    <y>485</y>
-    <width>120</width>
-    <height>21</height>
-    <line_width>0</line_width>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1500</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
       <color red="128" green="0" blue="255">
       </color>
     </line_color>
-    <actions>
-    </actions>
-    <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>755</x>
-    <y>480</y>
-    <width>360</width>
-    <height>155</height>
-    <line_width>1</line_width>
-    <line_color>
-      <color red="0" green="0" blue="0">
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
-    </line_color>
-    <transparent>true</transparent>
+    </background_color>
     <actions>
     </actions>
     <tooltip>$(pv_name)
@@ -194,10 +406,11 @@ $(pv_value)</tooltip>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <file>../adcore/NDPluginBase.opi</file>
-    <x>5</x>
-    <y>40</y>
+    <x>10</x>
+    <y>80</y>
     <width>380</width>
     <height>555</height>
+    <resize>2</resize>
     <actions>
     </actions>
     <border_color>
@@ -207,87 +420,35 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Grouping Container</name>
-    <x>390</x>
-    <y>590</y>
-    <width>360</width>
-    <height>80</height>
+    <x>429</x>
+    <y>708</y>
+    <width>379</width>
+    <height>78</height>
     <style>3</style>
     <foreground_color>
-      <color red="0" green="128" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
     </background_color>
-    <transparent>true</transparent>
     <actions>
     </actions>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle</name>
-      <x>127</x>
-      <y>2</y>
-      <width>107</width>
-      <height>21</height>
-      <line_width>0</line_width>
-      <line_color>
-        <color red="128" green="0" blue="255">
-        </color>
-      </line_color>
-      <actions>
-      </actions>
-      <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    </widget>
-    <widget type="rectangle" version="2.0.0">
-      <name>Rectangle</name>
-      <width>360</width>
-      <height>80</height>
-      <line_width>1</line_width>
-      <line_color>
-        <color red="0" green="0" blue="0">
-        </color>
-      </line_color>
-      <transparent>true</transparent>
-      <actions>
-      </actions>
-      <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-    </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Reset</text>
-      <x>155</x>
-      <y>2</y>
+      <text>Reset:</text>
+      <x>146</x>
+      <y>20</y>
       <width>50</width>
-      <font>
-        <font family="Sans" style="REGULAR" size="10.891089108910892">
-        </font>
-      </font>
       <foreground_color>
-        <color red="10" green="0" blue="184">
+        <color red="0" green="0" blue="0">
         </color>
       </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-      <wrap_words>false</wrap_words>
-      <actions>
-      </actions>
-      <border_color>
-        <color red="0" green="128" blue="255">
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
         </color>
-      </border_color>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>Reset</text>
-      <x>135</x>
-      <y>29</y>
-      <width>50</width>
-      <font>
-        <font family="Sans" style="REGULAR" size="10.891089108910892">
-        </font>
-      </font>
+      </background_color>
       <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
@@ -302,7 +463,7 @@ $(pv_value)</tooltip>
       <name>Menu Button</name>
       <actions>
         <action type="open_display">
-          <file>yySseq_full.opi</file>
+          <file>../calc/yySseq_full.opi</file>
           <macros>
             <S>$(R)Reset</S>
           </macros>
@@ -310,7 +471,7 @@ $(pv_value)</tooltip>
           <description>Reset</description>
         </action>
         <action type="open_display">
-          <file>yySseq_full.opi</file>
+          <file>../calc/yySseq_full.opi</file>
           <macros>
             <S>$(R)Reset1</S>
           </macros>
@@ -318,7 +479,7 @@ $(pv_value)</tooltip>
           <description>Reset1</description>
         </action>
         <action type="open_display">
-          <file>yySseq_full.opi</file>
+          <file>../calc/yySseq_full.opi</file>
           <macros>
             <S>$(R)Reset2</S>
           </macros>
@@ -327,26 +488,34 @@ $(pv_value)</tooltip>
         </action>
       </actions>
       <text>Menu Button Label</text>
-      <x>196</x>
-      <y>54</y>
+      <x>207</x>
+      <y>45</y>
       <width>60</width>
       <height>20</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
       <background_color>
-        <color red="115" green="223" blue="255">
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
         </color>
       </background_color>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Configure</text>
-      <x>95</x>
-      <y>54</y>
+      <text>Configure:</text>
+      <x>106</x>
+      <y>45</y>
       <width>90</width>
-      <font>
-        <font family="Sans" style="REGULAR" size="10.891089108910892">
-        </font>
-      </font>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
       <horizontal_alignment>2</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
       <wrap_words>false</wrap_words>
@@ -367,56 +536,44 @@ $(pv_value)</tooltip>
       </actions>
       <pv_name>$(P)$(R)Reset.PROC</pv_name>
       <text>Reset</text>
-      <x>196</x>
-      <y>29</y>
+      <x>207</x>
+      <y>20</y>
       <width>60</width>
       <height>20</height>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
       <background_color>
-        <color red="115" green="223" blue="255">
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>10</y>
-    <width>1120</width>
-    <height>25</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1500</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Statistics</text>
-    <x>519</x>
-    <y>44</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -427,12 +584,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ComputeStatistics</pv_name>
-    <x>584</x>
-    <y>72</y>
+    <x>637</x>
+    <y>118</y>
     <width>60</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -440,20 +601,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ComputeStatistics_RBV</pv_name>
-    <x>650</x>
-    <y>72</y>
+    <x>703</x>
+    <y>118</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -470,14 +627,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Compute statistics</text>
-    <x>395</x>
-    <y>71</y>
+    <text>Compute statistics:</text>
+    <x>448</x>
+    <y>117</y>
     <width>180</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -490,14 +651,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Background width</text>
-    <x>414</x>
-    <y>96</y>
+    <text>Background width:</text>
+    <x>467</x>
+    <y>142</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -511,15 +676,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)BgdWidth</pv_name>
-    <x>583</x>
-    <y>96</y>
+    <x>636</x>
+    <y>142</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -535,20 +700,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)BgdWidth_RBV</pv_name>
-    <x>649</x>
-    <y>97</y>
+    <x>702</x>
+    <y>143</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -565,13 +725,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Cursor X</text>
-    <x>860</x>
-    <y>143</y>
+    <x>950</x>
+    <y>208</y>
     <width>80</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -585,8 +749,8 @@ $(pv_value)</tooltip>
   <widget type="scrollbar" version="2.0.0">
     <name>Scrollbar</name>
     <pv_name>$(P)$(R)CursorX</pv_name>
-    <x>949</x>
-    <y>143</y>
+    <x>1039</x>
+    <y>208</y>
     <width>160</width>
     <actions>
     </actions>
@@ -595,16 +759,16 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)CursorX</pv_name>
-    <x>949</x>
-    <y>121</y>
+    <x>1039</x>
+    <y>186</y>
     <width>60</width>
     <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -620,20 +784,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CursorX_RBV</pv_name>
-    <x>1014</x>
-    <y>121</y>
+    <x>1104</x>
+    <y>186</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -650,13 +810,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Cursor Y</text>
-    <x>860</x>
-    <y>188</y>
+    <x>950</x>
+    <y>253</y>
     <width>80</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -670,8 +834,8 @@ $(pv_value)</tooltip>
   <widget type="scrollbar" version="2.0.0">
     <name>Scrollbar</name>
     <pv_name>$(P)$(R)CursorY</pv_name>
-    <x>949</x>
-    <y>188</y>
+    <x>1039</x>
+    <y>253</y>
     <width>160</width>
     <actions>
     </actions>
@@ -680,16 +844,16 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)CursorY</pv_name>
-    <x>949</x>
-    <y>166</y>
+    <x>1039</x>
+    <y>231</y>
     <width>60</width>
     <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -705,20 +869,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CursorY_RBV</pv_name>
-    <x>1014</x>
-    <y>166</y>
+    <x>1104</x>
+    <y>231</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -735,12 +895,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ComputeProfiles</pv_name>
-    <x>949</x>
-    <y>72</y>
+    <x>1039</x>
+    <y>137</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -748,20 +912,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ComputeProfiles_RBV</pv_name>
-    <x>1015</x>
-    <y>72</y>
+    <x>1105</x>
+    <y>137</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -778,14 +938,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Compute profiles</text>
-    <x>780</x>
-    <y>71</y>
+    <text>Compute profiles:</text>
+    <x>870</x>
+    <y>136</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -798,14 +962,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Size X</text>
-    <x>799</x>
-    <y>96</y>
+    <text>Size X:</text>
+    <x>889</x>
+    <y>161</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -819,20 +987,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ProfileSizeX_RBV</pv_name>
-    <x>863</x>
-    <y>97</y>
+    <x>953</x>
+    <y>162</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -849,20 +1013,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ProfileSizeY_RBV</pv_name>
-    <x>1015</x>
-    <y>97</y>
+    <x>1105</x>
+    <y>162</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -879,38 +1039,18 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Y</text>
-    <x>999</x>
-    <y>96</y>
+    <x>1089</x>
+    <y>161</y>
     <width>10</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Profiles</text>
-    <x>894</x>
-    <y>45</y>
-    <width>80</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -1013,12 +1153,16 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Menu Button Label</text>
-    <x>951</x>
-    <y>213</y>
+    <x>1041</x>
+    <y>278</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
@@ -1026,13 +1170,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Plot</text>
-    <x>900</x>
-    <y>213</y>
+    <x>990</x>
+    <y>278</y>
     <width>40</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1045,14 +1193,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Minimum</text>
-    <x>405</x>
-    <y>121</y>
+    <text>Minimum:</text>
+    <x>458</x>
+    <y>167</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1066,20 +1218,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MinValue_RBV</pv_name>
-    <x>479</x>
-    <y>122</y>
+    <x>532</x>
+    <y>168</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1095,14 +1242,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Maximum</text>
-    <x>575</x>
-    <y>121</y>
+    <text>Maximum:</text>
+    <x>628</x>
+    <y>167</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1116,20 +1267,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MaxValue_RBV</pv_name>
-    <x>649</x>
-    <y>122</y>
+    <x>702</x>
+    <y>168</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1145,14 +1291,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Min. X</text>
-    <x>415</x>
-    <y>146</y>
+    <text>Min. X:</text>
+    <x>468</x>
+    <y>192</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1166,20 +1316,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MinX_RBV</pv_name>
-    <x>479</x>
-    <y>147</y>
+    <x>532</x>
+    <y>193</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1195,14 +1340,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Max. X</text>
-    <x>585</x>
-    <y>146</y>
+    <text>Max. X:</text>
+    <x>638</x>
+    <y>192</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1216,20 +1365,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MaxX_RBV</pv_name>
-    <x>649</x>
-    <y>147</y>
+    <x>702</x>
+    <y>193</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1245,14 +1389,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Min. Y</text>
-    <x>415</x>
-    <y>171</y>
+    <text>Min. Y:</text>
+    <x>468</x>
+    <y>217</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1266,20 +1414,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MinY_RBV</pv_name>
-    <x>479</x>
-    <y>172</y>
+    <x>532</x>
+    <y>218</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1295,14 +1438,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Max. Y</text>
-    <x>585</x>
-    <y>171</y>
+    <text>Max. Y:</text>
+    <x>638</x>
+    <y>217</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1316,20 +1463,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MaxY_RBV</pv_name>
-    <x>649</x>
-    <y>172</y>
+    <x>702</x>
+    <y>218</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1345,14 +1487,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Total</text>
-    <x>423</x>
-    <y>196</y>
+    <text>Total:</text>
+    <x>476</x>
+    <y>242</y>
     <width>50</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1366,20 +1512,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Total_RBV</pv_name>
-    <x>479</x>
-    <y>197</y>
+    <x>532</x>
+    <y>243</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1395,14 +1536,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Net</text>
-    <x>613</x>
-    <y>196</y>
+    <text>Net:</text>
+    <x>666</x>
+    <y>242</y>
     <width>30</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1416,20 +1561,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Net_RBV</pv_name>
-    <x>649</x>
-    <y>197</y>
+    <x>702</x>
+    <y>243</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1445,14 +1585,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Mean</text>
-    <x>435</x>
-    <y>221</y>
+    <text>Mean:</text>
+    <x>488</x>
+    <y>267</y>
     <width>40</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1466,20 +1610,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)MeanValue_RBV</pv_name>
-    <x>479</x>
-    <y>222</y>
+    <x>532</x>
+    <y>268</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1495,14 +1634,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Sigma</text>
-    <x>595</x>
-    <y>221</y>
+    <text>Sigma:</text>
+    <x>648</x>
+    <y>267</y>
     <width>50</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1516,20 +1659,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Sigma_RBV</pv_name>
-    <x>649</x>
-    <y>222</y>
+    <x>702</x>
+    <y>268</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1549,8 +1687,8 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
         <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSTotal</RN>
+          <R>$(TS)</R>
+          <RN>$(TS)TSTotal</RN>
         </macros>
         <target>tab</target>
         <description>Total</description>
@@ -1652,26 +1790,34 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>Menu Button Label</text>
-    <x>590</x>
-    <y>246</y>
+    <x>643</x>
+    <y>292</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Time series plots</text>
-    <x>415</x>
-    <y>246</y>
+    <text>Time series plots:</text>
+    <x>468</x>
+    <y>292</y>
     <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1685,12 +1831,16 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ComputeCentroid</pv_name>
-    <x>584</x>
-    <y>311</y>
+    <x>638</x>
+    <y>369</y>
     <width>60</width>
     <height>18</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1698,20 +1848,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)ComputeCentroid_RBV</pv_name>
-    <x>650</x>
-    <y>311</y>
+    <x>704</x>
+    <y>369</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -1728,14 +1874,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Compute centroid</text>
-    <x>415</x>
-    <y>310</y>
+    <text>Compute centroid:</text>
+    <x>469</x>
+    <y>368</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1748,38 +1898,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Centroid</text>
-    <x>529</x>
-    <y>285</y>
-    <width>80</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Centroid threshold:</text>
+    <x>449</x>
+    <y>393</y>
+    <width>180</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Centroid threshold</text>
-    <x>395</x>
-    <y>335</y>
-    <width>180</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1793,16 +1923,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)CentroidThreshold</pv_name>
-    <x>584</x>
-    <y>336</y>
+    <x>638</x>
+    <y>394</y>
     <width>60</width>
-    <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1818,20 +1947,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CentroidThreshold_RBV</pv_name>
-    <x>650</x>
-    <y>336</y>
+    <x>704</x>
+    <y>394</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1845,39 +1970,19 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Histogram</text>
-    <x>890</x>
-    <y>247</y>
-    <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)ComputeHistogram</pv_name>
-    <x>951</x>
-    <y>275</y>
+    <x>1052</x>
+    <y>364</y>
     <width>60</width>
-    <height>18</height>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -1885,13 +1990,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Compute histogram?</text>
-    <x>760</x>
-    <y>274</y>
+    <x>858</x>
+    <y>364</y>
     <width>180</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1905,15 +2014,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)HistSize</pv_name>
-    <x>951</x>
-    <y>299</y>
+    <x>1052</x>
+    <y>388</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -1928,58 +2037,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Size</text>
-    <x>900</x>
-    <y>299</y>
+    <text>Size:</text>
+    <x>1001</x>
+    <y>388</y>
     <width>40</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input</name>
-    <pv_name>$(P)$(R)HistMin</pv_name>
-    <x>951</x>
-    <y>324</y>
-    <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Minimum</text>
-    <x>870</x>
-    <y>324</y>
-    <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -1992,16 +2061,16 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
-    <pv_name>$(P)$(R)HistMax</pv_name>
-    <x>951</x>
-    <y>349</y>
+    <pv_name>$(P)$(R)HistMin</pv_name>
+    <x>1052</x>
+    <y>413</y>
     <width>60</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2016,76 +2085,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Maximum</text>
-    <x>870</x>
-    <y>349</y>
+    <text>Minimum:</text>
+    <x>971</x>
+    <y>413</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)ComputeHistogram_RBV</pv_name>
-    <x>1018</x>
-    <y>275</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="70" green="70" blue="70">
-      </color>
-    </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)HistSize_RBV</pv_name>
-    <x>1018</x>
-    <y>300</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2095,57 +2107,45 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)HistMin_RBV</pv_name>
-    <x>1018</x>
-    <y>325</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(R)HistMax</pv_name>
+    <x>1052</x>
+    <y>438</y>
+    <width>60</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
     <actions>
     </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
     <border_color>
       <color red="0" green="128" blue="255">
       </color>
     </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update</name>
-    <pv_name>$(P)$(R)HistMax_RBV</pv_name>
-    <x>1018</x>
-    <y>350</y>
-    <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Maximum:</text>
+    <x>971</x>
+    <y>438</y>
+    <width>70</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2157,13 +2157,17 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Centroid X</text>
-    <x>395</x>
-    <y>385</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Centroid X:</text>
+    <x>429</x>
+    <y>450</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2177,20 +2181,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CentroidX_RBV</pv_name>
-    <x>499</x>
-    <y>386</y>
+    <x>533</x>
+    <y>451</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2207,20 +2206,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CentroidY_RBV</pv_name>
-    <x>650</x>
-    <y>386</y>
+    <x>704</x>
+    <y>444</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2237,13 +2232,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Y</text>
-    <x>634</x>
-    <y>385</y>
+    <x>688</x>
+    <y>443</y>
     <width>10</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2256,14 +2255,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Centroid total</text>
-    <x>395</x>
-    <y>361</y>
+    <text>Centroid total:</text>
+    <x>449</x>
+    <y>419</y>
     <width>140</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2277,20 +2280,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)CentroidTotal_RBV</pv_name>
-    <x>539</x>
-    <y>362</y>
+    <x>593</x>
+    <y>420</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2307,20 +2305,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)SigmaXY_RBV</pv_name>
-    <x>519</x>
-    <y>486</y>
+    <x>535</x>
+    <y>556</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2336,14 +2329,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Sigma XY</text>
-    <x>435</x>
-    <y>485</y>
+    <text>Sigma XY:</text>
+    <x>451</x>
+    <y>555</y>
     <width>80</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2357,20 +2354,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)SigmaY_RBV</pv_name>
-    <x>650</x>
-    <y>411</y>
+    <x>704</x>
+    <y>469</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2387,13 +2380,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Y</text>
-    <x>634</x>
-    <y>410</y>
+    <x>688</x>
+    <y>468</y>
     <width>10</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2407,20 +2404,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)SigmaX_RBV</pv_name>
-    <x>499</x>
-    <y>411</y>
+    <x>533</x>
+    <y>476</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2436,14 +2428,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Sigma X</text>
-    <x>425</x>
-    <y>410</y>
+    <text>Sigma X:</text>
+    <x>459</x>
+    <y>475</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2457,20 +2453,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)SkewY_RBV</pv_name>
-    <x>650</x>
-    <y>436</y>
+    <x>704</x>
+    <y>494</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2487,13 +2479,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Y</text>
-    <x>634</x>
-    <y>435</y>
+    <x>688</x>
+    <y>493</y>
     <width>10</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2507,20 +2503,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)SkewX_RBV</pv_name>
-    <x>499</x>
-    <y>436</y>
+    <x>533</x>
+    <y>501</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2536,13 +2527,17 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Skewness X</text>
-    <x>395</x>
-    <y>435</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Skewness X:</text>
+    <x>429</x>
+    <y>500</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2556,20 +2551,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)KurtosisY_RBV</pv_name>
-    <x>650</x>
-    <y>461</y>
+    <x>704</x>
+    <y>519</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2586,13 +2577,17 @@ $(pv_value)</tooltip>
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <text>Y</text>
-    <x>634</x>
-    <y>460</y>
+    <x>688</x>
+    <y>518</y>
     <width>10</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2606,20 +2601,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)KurtosisX_RBV</pv_name>
-    <x>499</x>
-    <y>461</y>
+    <x>533</x>
+    <y>526</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2635,161 +2625,17 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Kurtosis X</text>
-    <x>395</x>
-    <y>460</y>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Menu Button</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSCentroidTotal</RN>
-        </macros>
-        <target>tab</target>
-        <description>Total</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSCentroidY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Centroid X</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSCentroidY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Centroid Y</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSSigmaX</RN>
-        </macros>
-        <target>tab</target>
-        <description>Sigma X</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSSigmaY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Sigma Y</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSSkewX</RN>
-        </macros>
-        <target>tab</target>
-        <description>Skewness X</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSSkewY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Skewness Y</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSKurtosisX</RN>
-        </macros>
-        <target>tab</target>
-        <description>Kurtosis X</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSKurtosisY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Kurtosis Y</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSSigmaXY</RN>
-        </macros>
-        <target>tab</target>
-        <description>Sigma XY</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSEccentricity</RN>
-        </macros>
-        <target>tab</target>
-        <description>Eccentricity</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesPlot.opi</file>
-        <macros>
-          <R>$(R)TS-</R>
-          <RN>$(R)TSOrientation</RN>
-        </macros>
-        <target>tab</target>
-        <description>Orientation</description>
-      </action>
-      <action type="open_display">
-        <file>../adcore/NDStatsTimeSeriesCentroidAll.opi</file>
-        <target>tab</target>
-        <description>All</description>
-      </action>
-    </actions>
-    <text>Menu Button Label</text>
-    <x>590</x>
-    <y>560</y>
-    <width>60</width>
-    <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Time series plots</text>
-    <x>415</x>
-    <y>560</y>
-    <width>170</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Kurtosis X:</text>
+    <x>429</x>
+    <y>525</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2803,20 +2649,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Eccentricity_RBV</pv_name>
-    <x>519</x>
-    <y>511</y>
+    <x>535</x>
+    <y>581</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2832,14 +2673,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Eccentricity</text>
-    <x>395</x>
-    <y>510</y>
+    <text>Eccentricity:</text>
+    <x>411</x>
+    <y>580</y>
     <width>120</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2853,20 +2698,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)Orientation_RBV</pv_name>
-    <x>519</x>
-    <y>536</y>
+    <x>535</x>
+    <y>606</y>
     <width>90</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2882,14 +2722,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Orientation</text>
-    <x>405</x>
-    <y>535</y>
+    <text>Orientation:</text>
+    <x>421</x>
+    <y>605</y>
     <width>110</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2903,20 +2747,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)HistEntropy_RBV</pv_name>
-    <x>951</x>
-    <y>425</y>
+    <x>1052</x>
+    <y>514</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2932,14 +2771,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Entropy</text>
-    <x>870</x>
-    <y>424</y>
+    <text>Entropy:</text>
+    <x>971</x>
+    <y>513</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -2953,20 +2796,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)HistAbove_RBV</pv_name>
-    <x>951</x>
-    <y>400</y>
+    <x>1052</x>
+    <y>489</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -2982,14 +2820,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text># above maximum</text>
-    <x>790</x>
-    <y>399</y>
+    <text># above maximum:</text>
+    <x>891</x>
+    <y>488</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3003,20 +2845,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)HistBelow_RBV</pv_name>
-    <x>951</x>
-    <y>375</y>
+    <x>1052</x>
+    <y>464</y>
     <width>61</width>
-    <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -3032,14 +2869,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text># below minimum</text>
-    <x>790</x>
-    <y>374</y>
+    <text># below minimum:</text>
+    <x>891</x>
+    <y>463</y>
     <width>150</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3067,26 +2908,34 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text></text>
-    <x>951</x>
-    <y>449</y>
+    <x>1052</x>
+    <y>538</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Plot</text>
-    <x>900</x>
-    <y>449</y>
+    <text>Plot:</text>
+    <x>1001</x>
+    <y>538</y>
     <width>40</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3099,38 +2948,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Time Series</text>
-    <x>880</x>
-    <y>485</y>
-    <width>110</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <text>Current point:</text>
+    <x>908</x>
+    <y>686</y>
+    <width>130</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <background_color>
+      <color red="255" green="255" blue="255">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>Current point</text>
-    <x>816</x>
-    <y>562</y>
-    <width>130</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3144,20 +2973,16 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)TS-TSCurrentPoint</pv_name>
-    <x>951</x>
-    <y>563</y>
+    <x>1043</x>
+    <y>687</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -3174,11 +2999,15 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)TS-TSRead.SCAN</pv_name>
-    <x>931</x>
-    <y>587</y>
+    <x>1023</x>
+    <y>711</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -3187,31 +3016,39 @@ $(pv_value)</tooltip>
     <name>Action Button</name>
     <actions>
       <action type="write_pv">
-        <pv_name>$(P)$(R)TS-TSRead.PROC</pv_name>
+        <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS-TSRead.PROC</pv_name>
     <text>Read</text>
-    <x>1036</x>
-    <y>587</y>
+    <x>1128</x>
+    <y>711</y>
     <width>70</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Read rate</text>
-    <x>836</x>
-    <y>587</y>
+    <text>Read rate:</text>
+    <x>928</x>
+    <y>711</y>
     <width>90</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3225,16 +3062,16 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)TS-TSNumPoints</pv_name>
-    <x>951</x>
-    <y>538</y>
+    <x>1043</x>
+    <y>662</y>
     <width>60</width>
     <height>19</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
@@ -3249,14 +3086,18 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Number of points</text>
-    <x>786</x>
-    <y>537</y>
+    <text>Number of points:</text>
+    <x>878</x>
+    <y>661</y>
     <width>160</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -3271,18 +3112,22 @@ $(pv_value)</tooltip>
     <name>Action Button</name>
     <actions>
       <action type="write_pv">
-        <pv_name>$(P)$(R)TS-TSAcquire</pv_name>
+        <pv_name>$(pv_name)</pv_name>
         <value>1</value>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS-TSAcquire</pv_name>
     <text>Erase/Start</text>
-    <x>856</x>
-    <y>512</y>
+    <x>948</x>
+    <y>636</y>
     <width>90</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
@@ -3290,38 +3135,38 @@ $(pv_value)</tooltip>
     <name>Action Button</name>
     <actions>
       <action type="write_pv">
-        <pv_name>$(P)$(R)TS-TSAcquire</pv_name>
+        <pv_name>$(pv_name)</pv_name>
         <value>0</value>
       </action>
     </actions>
     <pv_name>$(P)$(R)TS-TSAcquire</pv_name>
     <text>Stop</text>
-    <x>951</x>
-    <y>512</y>
+    <x>1043</x>
+    <y>636</y>
     <width>60</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)TS-TSAcquiring</pv_name>
-    <x>1016</x>
-    <y>513</y>
+    <x>1108</x>
+    <y>637</y>
     <width>90</width>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color name="OK" red="0" green="255" blue="0">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="70" green="70" blue="70">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -3338,14 +3183,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>Acquire</text>
-    <x>781</x>
-    <y>512</y>
+    <text>Acquire:</text>
+    <x>873</x>
+    <y>636</y>
     <width>70</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3368,26 +3218,35 @@ $(pv_value)</tooltip>
       </action>
     </actions>
     <text>More</text>
-    <x>1036</x>
-    <y>612</y>
+    <x>1128</x>
+    <y>736</y>
     <width>70</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>AcquireMode</text>
-    <x>816</x>
-    <y>611</y>
+    <text>AcquireMode:</text>
+    <x>908</x>
+    <y>735</y>
     <width>110</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -3400,13 +3259,125 @@ $(pv_value)</tooltip>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
     <pv_name>$(P)$(R)TS-TSAcquireMode</pv_name>
-    <x>931</x>
-    <y>611</y>
+    <x>1023</x>
+    <y>735</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_11</name>
+    <text>Statistics</text>
+    <x>448</x>
+    <y>80</y>
+    <width>360</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_12</name>
+    <text>Centroid</text>
+    <x>429</x>
+    <y>327</y>
+    <width>376</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_13</name>
+    <text>Time series</text>
+    <x>873</x>
+    <y>586</y>
+    <width>379</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_14</name>
+    <text>Reset</text>
+    <x>429</x>
+    <y>675</y>
+    <width>379</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_15</name>
+    <text>Histogram</text>
+    <x>871</x>
+    <y>330</y>
+    <width>379</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_16</name>
+    <text>Profiles</text>
+    <x>870</x>
+    <y>80</y>
+    <width>379</width>
+    <height>30</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD" size="21.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>
diff --git a/99-Shared/admisc/NDTrace.bob b/99-Shared/admisc/NDTrace.bob
index 5030c8d09c682a18ba7fc282648a1d2dd2e63cd9..c9a999e45d411eaae369a8c69a2b00a231889a13 100644
--- a/99-Shared/admisc/NDTrace.bob
+++ b/99-Shared/admisc/NDTrace.bob
@@ -4,22 +4,46 @@
   <x>470</x>
   <y>197</y>
   <width>1550</width>
+  <height>650</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
   <actions>
   </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <x>400</x>
+    <y>70</y>
+    <width>1150</width>
+    <height>555</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>Rectangle</name>
-    <y>5</y>
-    <width>390</width>
-    <height>25</height>
-    <line_width>0</line_width>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1550</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
       <color red="128" green="0" blue="255">
       </color>
     </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
     <actions>
     </actions>
     <tooltip>$(pv_name)
@@ -28,10 +52,10 @@ $(pv_value)</tooltip>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container</name>
     <file>../adcore/NDPluginBase.opi</file>
-    <x>5</x>
-    <y>40</y>
-    <width>383</width>
-    <height>558</height>
+    <x>10</x>
+    <y>70</y>
+    <width>380</width>
+    <height>555</height>
     <resize>2</resize>
     <actions>
     </actions>
@@ -42,21 +66,28 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>6</y>
-    <width>390</width>
-    <height>25</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="14.851485148514852">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1530</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <foreground_color>
-      <color red="10" green="0" blue="184">
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
     <actions>
     </actions>
     <border_color>
@@ -66,16 +97,20 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="xyplot" version="2.0.0">
     <name>XY Graph</name>
-    <x>398</x>
-    <y>4</y>
+    <x>424</x>
+    <y>80</y>
     <width>1105</width>
-    <height>495</height>
+    <height>460</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
     <title_font>
-      <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+      <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
       </font>
     </title_font>
     <show_toolbar>true</show_toolbar>
@@ -109,11 +144,11 @@ $(pv_value)</tooltip>
       <maximum>100.0</maximum>
       <show_grid>true</show_grid>
       <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
         </font>
       </title_font>
       <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
         </font>
       </scale_font>
       <visible>true</visible>
@@ -127,11 +162,11 @@ $(pv_value)</tooltip>
         <maximum>100.0</maximum>
         <show_grid>true</show_grid>
         <title_font>
-          <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
           </font>
         </title_font>
         <scale_font>
-          <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
           </font>
         </scale_font>
         <visible>true</visible>
@@ -159,14 +194,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_1</name>
-    <text>Time link or time/point</text>
-    <x>412</x>
-    <y>510</y>
+    <text>Time link or time/point:</text>
+    <x>590</x>
+    <y>560</y>
     <width>228</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -179,15 +219,15 @@ $(pv_value)</tooltip>
   <widget type="textentry" version="3.0.0">
     <name>Text Input</name>
     <pv_name>$(P)$(R)TimePerPointLink.DOL</pv_name>
-    <x>650</x>
-    <y>510</y>
-    <width>429</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <x>828</x>
+    <y>560</y>
+    <width>391</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
@@ -202,14 +242,19 @@ $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_2</name>
-    <text>Time/point</text>
-    <x>414</x>
-    <y>537</y>
+    <text>Time/point:</text>
+    <x>680</x>
+    <y>588</y>
     <width>138</width>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -222,19 +267,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update</name>
     <pv_name>$(P)$(R)TimePerPointR</pv_name>
-    <x>651</x>
-    <y>538</y>
+    <x>829</x>
+    <y>588</y>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
@@ -250,19 +291,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
     <pv_name>$(P)$(R)TimePerPointUsR</pv_name>
-    <x>941</x>
-    <y>538</y>
+    <x>1119</x>
+    <y>588</y>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
@@ -278,19 +315,15 @@ $(pv_value)</tooltip>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_2</name>
     <pv_name>$(P)$(R)TimePerPointMsR</pv_name>
-    <x>793</x>
-    <y>538</y>
+    <x>971</x>
+    <y>588</y>
     <height>18</height>
-    <font>
-      <font family="Sans" style="REGULAR" size="10.891089108910892">
-      </font>
-    </font>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>2</format>
diff --git a/99-Shared/adsis8300fc/channel.bob b/99-Shared/adsis8300fc/channel.bob
new file mode 100644
index 0000000000000000000000000000000000000000..4ed7a0976fdc12f41e46ee56a9a2ae51ed4d478a
--- /dev/null
+++ b/99-Shared/adsis8300fc/channel.bob
@@ -0,0 +1,3267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>$(TITLE) : $(CH)</name>
+  <width>2000</width>
+  <height>2200</height>
+  <background_color>
+    <color red="240" green="240" blue="240">
+    </color>
+  </background_color>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_10</name>
+    <x>1319</x>
+    <y>62</y>
+    <width>558</width>
+    <height>837</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_9</name>
+    <x>865</x>
+    <y>514</y>
+    <width>446</width>
+    <height>385</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_7</name>
+    <x>443</x>
+    <y>515</y>
+    <width>406</width>
+    <height>385</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_11</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>1870</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_10</name>
+    <x>865</x>
+    <y>515</y>
+    <width>444</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_9</name>
+    <x>443</x>
+    <y>515</y>
+    <width>406</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_2</name>
+    <x>13</x>
+    <y>673</y>
+    <width>406</width>
+    <height>135</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_1</name>
+    <x>13</x>
+    <y>512</y>
+    <width>406</width>
+    <height>135</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_6</name>
+    <x>13</x>
+    <y>673</y>
+    <width>406</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <x>13</x>
+    <y>106</y>
+    <width>406</width>
+    <height>384</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_4</name>
+    <x>13</x>
+    <y>76</y>
+    <width>406</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_39</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-MinX_RBV</pv_name>
+    <x>650</x>
+    <y>590</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <x>197</x>
+    <y>130</y>
+    <width>21</width>
+    <height>21</height>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_41</name>
+    <pv_name>$(P)$(R)Acquire_RBV</pv_name>
+    <x>241</x>
+    <y>130</y>
+    <width>121</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_45</name>
+    <pv_name>$(P)$(R)NumSamplesR</pv_name>
+    <x>197</x>
+    <y>210</y>
+    <width>155</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_131</name>
+    <text>Start:</text>
+    <x>410</x>
+    <y>590</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_51</name>
+    <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+    <x>197</x>
+    <y>252</y>
+    <width>154</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="polyline" version="2.0.0">
+    <name>Polyline</name>
+    <height>100</height>
+    <line_width>1</line_width>
+    <line_color>
+      <color red="30" green="144" blue="255">
+      </color>
+    </line_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="polyline" version="2.0.0">
+    <name>Polyline_1</name>
+    <height>100</height>
+    <line_width>1</line_width>
+    <line_color>
+      <color red="30" green="144" blue="255">
+      </color>
+    </line_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph_2</name>
+    <x>443</x>
+    <y>76</y>
+    <width>836</width>
+    <height>436</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title_font>
+      <font family="Arial" style="BOLD" size="11.881188118811881">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="trace_buffer_size" prop_id="trace_2_buffer_size" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-TRC2-ArraySize0_RBV</pv_name>
+      </rule>
+      <rule name="y_max" prop_id="axis_1_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-TRC2-ArraySize1_RBV</pv_name>
+      </rule>
+      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
+        <exp bool_exp="pv0==1">
+          <expression>"mA"</expression>
+        </exp>
+        <exp bool_exp="pv0==0">
+          <expression>"ADC counts"</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+      </rule>
+      <rule name="samples_x_max" prop_id="axis_0_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
+      </rule>
+      <rule name="time_x_min" prop_id="axis_2_minimum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-ROI2-TickFirstUsR</pv_name>
+      </rule>
+      <rule name="time_x_max" prop_id="axis_2_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-ROI2-TickLastUsR</pv_name>
+      </rule>
+    </rules>
+    <scripts>
+      <script file="handleCursors.js">
+        <pv_name>$(P)$(R)$(CH)-ROI3-MinX_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI3-SizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI3-BinX_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI2-MinX_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI2-BinX_RBV</pv_name>
+        <pv_name trigger="false">$(P)$(R)$(CH)-STAT3-MaxValue_RBV</pv_name>
+        <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
+      </script>
+    </scripts>
+    <x_axis>
+      <title>Samples</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>ADC counts</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>cursors</name>
+        <x_pv>loc://cur_x(0,0,0,0)</x_pv>
+        <y_pv>loc://cur_y(0,0,0,0)</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>5</trace_type>
+        <color>
+          <color name="ORANGE" red="254" green="194" blue="81">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>3</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>limits</name>
+        <x_pv>loc://lim_x(0,0,0,0,0,0)</x_pv>
+        <y_pv>loc://lim_y(0,0,0,0,0,0)</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>5</trace_type>
+        <color>
+          <color name="Invalid" red="255" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>3</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Pulse</name>
+        <x_pv></x_pv>
+        <y_pv>$(P)$(R)$(CH)-TRC2-ArrayData</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color name="IO PV ON" red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_52</name>
+    <pv_name>$(P)$(R)$(CH)-TRC2-ArrayCounter_RBV</pv_name>
+    <x>463</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_148</name>
+    <text>Counter</text>
+    <x>462</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_60</name>
+    <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
+    <x>197</x>
+    <y>169</y>
+    <width>155</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_157</name>
+    <text>Rate:</text>
+    <x>54</x>
+    <y>169</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_158</name>
+    <text>Status:</text>
+    <x>53</x>
+    <y>130</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_62</name>
+    <pv_name>$(P)$(R)$(CH)-TRC2-ArrayRate_RBV</pv_name>
+    <x>654</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_160</name>
+    <text>Rate</text>
+    <x>650</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_64</name>
+    <pv_name>$(P)$(R)$(CH)-TRC2-EnableCallbacks_RBV</pv_name>
+    <x>558</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_162</name>
+    <text>Status</text>
+    <x>559</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_163</name>
+    <text>Pulse counter:</text>
+    <x>54</x>
+    <y>252</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_66</name>
+    <pv_name>$(P)$(R)$(CH)-TRC2-DroppedArrays_RBV</pv_name>
+    <x>747</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_165</name>
+    <text>Dropped</text>
+    <x>746</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_166</name>
+    <text>Sample number:</text>
+    <x>54</x>
+    <y>210</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph_3</name>
+    <x>1340</x>
+    <y>450</y>
+    <width>522</width>
+    <height>283</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title_font>
+      <font family="Arial" style="BOLD" size="11.881188118811881">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Trace0" prop_id="trace_0_visible" out_exp="true">
+        <exp bool_exp="pv0==0">
+          <expression>false</expression>
+        </exp>
+        <pv_name>loc://Mean</pv_name>
+      </rule>
+      <rule name="Trace1" prop_id="trace_1_visible" out_exp="true">
+        <exp bool_exp="pv0==0">
+          <expression>false</expression>
+        </exp>
+        <pv_name>loc://Max</pv_name>
+      </rule>
+      <rule name="Trace2" prop_id="trace_2_visible" out_exp="true">
+        <exp bool_exp="pv0==0">
+          <expression>false</expression>
+        </exp>
+        <pv_name>loc://Min</pv_name>
+      </rule>
+      <rule name="AutoScale0" prop_id="axis_0_auto_scale" out_exp="true">
+        <exp bool_exp="true">
+          <expression>true</expression>
+        </exp>
+        <pv_name>loc://Min</pv_name>
+      </rule>
+      <rule name="AutoScale1" prop_id="axis_1_auto_scale" out_exp="true">
+        <exp bool_exp="true">
+          <expression>true</expression>
+        </exp>
+        <pv_name>loc://Min</pv_name>
+      </rule>
+      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
+        <exp bool_exp="pv0==1">
+          <expression>"mA"</expression>
+        </exp>
+        <exp bool_exp="pv0==0">
+          <expression>"ADC counts"</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+      </rule>
+      <rule name="trace1_buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-STAT3-TSTimestamp.NELM</pv_name>
+      </rule>
+    </rules>
+    <x_axis>
+      <title>Pulse</title>
+      <autoscale>true</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>1000.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font family="Arial" style="BOLD" size="8.910891089108912">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>ADC counts</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>60000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Arial" style="BOLD" size="8.910891089108912">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>Mean</name>
+        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)$(CH)-STAT3-TSMeanValue</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="75" green="110" blue="199">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Max</name>
+        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)$(CH)-STAT3-TSMaxValue</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="242" green="26" blue="26">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>Min</name>
+        <x_pv>$(P)$(R)$(CH)-STAT3-TSTimestamp</x_pv>
+        <y_pv>$(P)$(R)$(CH)-STAT3-TSMinValue</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="33" green="179" blue="33">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_71</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-TickFirstUsR</pv_name>
+    <x>738</x>
+    <y>590</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_73</name>
+    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSCurrentPoint</pv_name>
+    <x>1762</x>
+    <y>768</y>
+    <width>86</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_206</name>
+    <text>Current Point</text>
+    <x>1657</x>
+    <y>770</y>
+    <width>91</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="checkbox" version="2.0.0">
+    <name>Check Box</name>
+    <pv_name>loc://Min(1)</pv_name>
+    <label>Min</label>
+    <x>1701</x>
+    <y>819</y>
+    <width>68</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="checkbox" version="2.0.0">
+    <name>Check Box_1</name>
+    <pv_name>loc://Mean(1)</pv_name>
+    <label>Average</label>
+    <x>1610</x>
+    <y>819</y>
+    <width>77</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="checkbox" version="2.0.0">
+    <name>Check Box_2</name>
+    <pv_name>loc://Max(1)</pv_name>
+    <label>Max</label>
+    <x>1532</x>
+    <y>819</y>
+    <width>68</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_207</name>
+    <text>Trace visibility</text>
+    <x>1415</x>
+    <y>819</y>
+    <width>105</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_74</name>
+    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquiring</pv_name>
+    <x>1541</x>
+    <y>770</y>
+    <width>86</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_258</name>
+    <text>Binning:</text>
+    <x>412</x>
+    <y>680</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_81</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-BinX_RBV</pv_name>
+    <x>650</x>
+    <y>681</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_82</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-BinXTimeUsR</pv_name>
+    <x>738</x>
+    <y>681</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_259</name>
+    <text>Total:</text>
+    <x>410</x>
+    <y>710</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_83</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
+    <x>650</x>
+    <y>713</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_34</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquire</pv_name>
+    <text>(Re)start</text>
+    <x>1343</x>
+    <y>768</y>
+    <width>79</width>
+    <height>24</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_35</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)-STAT3-TS-TSAcquire</pv_name>
+    <text>Stop</text>
+    <x>1438</x>
+    <y>768</y>
+    <width>79</width>
+    <height>24</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>XY Graph_4</name>
+    <x>1340</x>
+    <y>74</y>
+    <width>514</width>
+    <height>355</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <title_font>
+      <font family="Arial" style="BOLD" size="11.881188118811881">
+      </font>
+    </title_font>
+    <show_toolbar>true</show_toolbar>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-TRC3-ArraySize0_RBV</pv_name>
+      </rule>
+      <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-TRC3-ArraySize1_RBV</pv_name>
+      </rule>
+      <rule name="data_x_max" prop_id="axis_0_maximum" out_exp="true">
+        <exp bool_exp="true">
+          <expression>pv0</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-ROI3-ArraySizeX_RBV</pv_name>
+      </rule>
+      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
+        <exp bool_exp="pv0==1">
+          <expression>"mA"</expression>
+        </exp>
+        <exp bool_exp="pv0==0">
+          <expression>"ADC counts"</expression>
+        </exp>
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+      </rule>
+    </rules>
+    <x_axis>
+      <title>Samples</title>
+      <autoscale>false</autoscale>
+      <log_scale>false</log_scale>
+      <minimum>0.0</minimum>
+      <maximum>100.0</maximum>
+      <show_grid>true</show_grid>
+      <title_font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </title_font>
+      <scale_font>
+        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+        </font>
+      </scale_font>
+      <visible>true</visible>
+    </x_axis>
+    <y_axes>
+      <y_axis>
+        <title>ADC counts</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+          </font>
+        </title_font>
+        <scale_font>
+          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
+          </font>
+        </scale_font>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>Flat top</name>
+        <x_pv>$(P)$(R)$(CH)-TRC3-ArrayTimeUs</x_pv>
+        <y_pv>$(P)$(R)$(CH)-TRC3-ArrayData</y_pv>
+        <err_pv></err_pv>
+        <axis>0</axis>
+        <trace_type>1</trace_type>
+        <color>
+          <color red="21" green="21" blue="196">
+          </color>
+        </color>
+        <line_width>1</line_width>
+        <line_style>0</line_style>
+        <point_type>0</point_type>
+        <point_size>4</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_298</name>
+    <text>Size:</text>
+    <x>410</x>
+    <y>621</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_91</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-SizeX_RBV</pv_name>
+    <x>650</x>
+    <y>623</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_92</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-TickCountUsR</pv_name>
+    <x>738</x>
+    <y>623</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_93</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-TotalXTimeUsR</pv_name>
+    <x>738</x>
+    <y>713</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_306</name>
+    <text>Sample no.</text>
+    <x>531</x>
+    <y>558</y>
+    <width>174</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_308</name>
+    <text>Time</text>
+    <x>738</x>
+    <y>558</y>
+    <width>93</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_309</name>
+    <text>End:</text>
+    <x>411</x>
+    <y>651</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_94</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-EndXR</pv_name>
+    <x>650</x>
+    <y>653</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_95</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-TickLastUsR</pv_name>
+    <x>738</x>
+    <y>653</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_96</name>
+    <pv_name>$(P)$(R)$(CH)-PulseChargeUcR</pv_name>
+    <x>199</x>
+    <y>568</y>
+    <width>128</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_97</name>
+    <pv_name>$(P)$(R)$(CH)-STAT3-MinValueR</pv_name>
+    <x>199</x>
+    <y>774</y>
+    <width>128</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <scripts>
+      <script file="change_stats_units.js">
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name trigger="false">$(pv_name).EGU</pv_name>
+      </script>
+    </scripts>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_311</name>
+    <text>Maximum:</text>
+    <x>80</x>
+    <y>720</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_98</name>
+    <pv_name>$(P)$(R)$(CH)-STAT3-MeanValueR</pv_name>
+    <x>199</x>
+    <y>746</y>
+    <width>128</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <scripts>
+      <script file="change_stats_units.js">
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name trigger="false">$(pv_name).EGU</pv_name>
+      </script>
+    </scripts>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_312</name>
+    <text>Average:</text>
+    <x>86</x>
+    <y>746</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_99</name>
+    <pv_name>$(P)$(R)$(CH)-STAT3-MaxValueR</pv_name>
+    <x>199</x>
+    <y>720</y>
+    <width>128</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <scripts>
+      <script file="change_stats_units.js">
+        <pv_name>$(P)$(R)$(CH)-PROC1-EnableOffsetScale_RBV</pv_name>
+        <pv_name trigger="false">$(pv_name).EGU</pv_name>
+      </script>
+    </scripts>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_313</name>
+    <text>Minimum:</text>
+    <x>79</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_101</name>
+    <pv_name>$(P)$(R)$(CH)-FlatTopChargeUcR</pv_name>
+    <x>199</x>
+    <y>605</y>
+    <width>128</width>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_102</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-MinX_RBV</pv_name>
+    <x>1093</x>
+    <y>589</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_103</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-TickFirstUsR</pv_name>
+    <x>1176</x>
+    <y>589</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_104</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-BinX_RBV</pv_name>
+    <x>1092</x>
+    <y>680</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_105</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-BinXTimeUsR</pv_name>
+    <x>1176</x>
+    <y>680</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_106</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-ArraySizeX_RBV</pv_name>
+    <x>1092</x>
+    <y>710</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_107</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-SizeX_RBV</pv_name>
+    <x>1093</x>
+    <y>618</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_108</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-TickCountUsR</pv_name>
+    <x>1176</x>
+    <y>618</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_109</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-TotalXTimeUsR</pv_name>
+    <x>1176</x>
+    <y>710</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_110</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-EndXR</pv_name>
+    <x>1092</x>
+    <y>648</y>
+    <width>70</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_111</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-TickLastUsR</pv_name>
+    <x>1176</x>
+    <y>648</y>
+    <width>94</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>1</format>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_49</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDROI.opi</file>
+        <macros>
+          <R>$(CH)-ROI2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>ROI 2</text>
+    <x>462</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_50</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDTrace.opi</file>
+        <macros>
+          <R>$(CH)-TRC2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Trace 2</text>
+    <x>651</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_51</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDStats.opi</file>
+        <macros>
+          <R>$(CH)-STAT3-</R>
+          <S>$(CH)-TS3-</S>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Statistics 3</text>
+    <x>1136</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_52</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDPluginTimeSeries.opi</file>
+        <macros>
+          <R>$(CH)-STAT3-TS-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Trends 3</text>
+    <x>1226</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_53</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDProcess.opi</file>
+        <macros>
+          <R>$(CH)-PROC2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Process 2</text>
+    <x>556</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_54</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDCircularBuff.opi</file>
+        <macros>
+          <R>$(CH)-CB1-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Circ Buff 1</text>
+    <x>197</x>
+    <y>420</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_55</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDROI.opi</file>
+        <macros>
+          <R>$(CH)-ROI3-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>ROI 3</text>
+    <x>875</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_56</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDTrace.opi</file>
+        <macros>
+          <R>$(CH)-TRC3-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Trace 3</text>
+    <x>1049</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_57</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDProcess.opi</file>
+        <macros>
+          <R>$(CH)-PROC3-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Process 3</text>
+    <x>962</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_58</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDTrace.opi</file>
+        <macros>
+          <R>$(CH)-TRC1-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Trace 1</text>
+    <x>197</x>
+    <y>390</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_59</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDProcess.opi</file>
+        <macros>
+          <R>$(CH)-PROC1-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Process 1</text>
+    <x>197</x>
+    <y>345</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_327</name>
+    <text>Debug:</text>
+    <x>92</x>
+    <y>390</y>
+    <width>104</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_60</name>
+    <actions>
+      <action type="open_display">
+        <file>../adcore/NDFileHDF5.opi</file>
+        <macros>
+          <R>$(CH)-HDF1-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>HDF5 1</text>
+    <x>197</x>
+    <y>450</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_5</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-MinX</pv_name>
+    <x>525</x>
+    <y>590</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_6</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-SizeX</pv_name>
+    <x>525</x>
+    <y>622</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_7</name>
+    <pv_name>$(P)$(R)$(CH)-ROI3-BinX</pv_name>
+    <x>525</x>
+    <y>680</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_8</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-MinX</pv_name>
+    <x>986</x>
+    <y>589</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_9</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-SizeX</pv_name>
+    <x>985</x>
+    <y>621</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+  </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_10</name>
+    <pv_name>$(P)$(R)$(CH)-ROI2-BinX</pv_name>
+    <x>985</x>
+    <y>680</y>
+    <width>99</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_64</name>
+    <actions>
+      <action type="open_display">
+        <file>../admisc/NDStats.opi</file>
+        <macros>
+          <R>$(CH)-STAT2-</R>
+        </macros>
+        <target>tab</target>
+      </action>
+    </actions>
+    <text>Statistics 2</text>
+    <x>746</x>
+    <y>838</y>
+    <width>77</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_334</name>
+    <text>Channel control:</text>
+    <x>33</x>
+    <y>292</y>
+    <width>141</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_65</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)-Control</pv_name>
+    <text>Enable</text>
+    <x>241</x>
+    <y>292</y>
+    <width>61</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_66</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
+    </actions>
+    <pv_name>$(P)$(R)$(CH)-Control</pv_name>
+    <text>Disable</text>
+    <x>319</x>
+    <y>292</y>
+    <width>67</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)$(CH)-ControlR</pv_name>
+    <x>197</x>
+    <y>292</y>
+    <width>21</width>
+    <height>21</height>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_335</name>
+    <text>Common:</text>
+    <x>46</x>
+    <y>344</y>
+    <width>126</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_112</name>
+    <pv_name>$(P)$(R)$(CH)-TRC3-ArrayCounter_RBV</pv_name>
+    <x>875</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_365</name>
+    <text>Counter</text>
+    <x>875</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_113</name>
+    <pv_name>$(P)$(R)$(CH)-TRC3-ArrayRate_RBV</pv_name>
+    <x>1050</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_366</name>
+    <text>Rate</text>
+    <x>1049</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_114</name>
+    <pv_name>$(P)$(R)$(CH)-TRC3-EnableCallbacks_RBV</pv_name>
+    <x>964</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_367</name>
+    <text>Status</text>
+    <x>962</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_115</name>
+    <pv_name>$(P)$(R)$(CH)-TRC3-DroppedArrays_RBV</pv_name>
+    <x>1136</x>
+    <y>800</y>
+    <width>74</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_368</name>
+    <text>Dropped</text>
+    <x>1136</x>
+    <y>774</y>
+    <width>72</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>GROUP-TITLE</class>
+    <text>General</text>
+    <x>13</x>
+    <y>76</y>
+    <width>406</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>GROUP-TITLE</class>
+    <text>General</text>
+    <x>13</x>
+    <y>512</y>
+    <width>406</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_5</name>
+    <x>13</x>
+    <y>512</y>
+    <width>406</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <class>GROUP-TITLE</class>
+    <text>Charge</text>
+    <x>13</x>
+    <y>512</y>
+    <width>406</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <class>GROUP-TITLE</class>
+    <text>Flat top current</text>
+    <x>13</x>
+    <y>673</y>
+    <width>406</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_167</name>
+    <text>Pulse charge: </text>
+    <x>38</x>
+    <y>568</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_168</name>
+    <text>Flat top charge:</text>
+    <x>38</x>
+    <y>605</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_173</name>
+    <class>GROUP-TITLE</class>
+    <text>Flat top ROI (cursors)</text>
+    <x>443</x>
+    <y>515</y>
+    <width>406</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_174</name>
+    <class>GROUP-TITLE</class>
+    <text>Pulse ROI (limits)</text>
+    <x>865</x>
+    <y>515</y>
+    <width>443</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_175</name>
+    <class>GROUP-TITLE</class>
+    <text>$(TITLE) // $(SYSTEM)</text>
+    <x>30</x>
+    <y>10</y>
+    <width>1840</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_132</name>
+    <text>Start:</text>
+    <x>870</x>
+    <y>591</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_299</name>
+    <text>Size:</text>
+    <x>870</x>
+    <y>622</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_310</name>
+    <text>End:</text>
+    <x>871</x>
+    <y>652</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_314</name>
+    <text>Binning:</text>
+    <x>872</x>
+    <y>681</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_315</name>
+    <text>Total:</text>
+    <x>870</x>
+    <y>711</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_316</name>
+    <text>Sample no.</text>
+    <x>991</x>
+    <y>559</y>
+    <width>174</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_317</name>
+    <text>Time</text>
+    <x>1198</x>
+    <y>559</y>
+    <width>93</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+</display>
diff --git a/99-Shared/adsis8300fc/fc.bob b/99-Shared/adsis8300fc/fc.bob
index 3b772563666492fd952772e1d018156612fe6a8d..7741dcea144498c0af3649bfd679eb980e173976 100644
--- a/99-Shared/adsis8300fc/fc.bob
+++ b/99-Shared/adsis8300fc/fc.bob
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <name>$(P)</name>
-  <width>2000</width>
+  <name>$(TITLE) : Main</name>
+  <class>TITLE-BAR</class>
   <height>800</height>
   <background_color>
     <color red="240" green="240" blue="240">
@@ -9,190 +9,171 @@
   </background_color>
   <actions>
   </actions>
-  <widget type="label" version="2.0.0">
-    <name>Label_336</name>
-    <text>Flat Top Current</text>
-    <x>14</x>
-    <y>686</y>
-    <width>405</width>
-    <height>128</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background_1</name>
+    <x>50</x>
+    <y>440</y>
+    <width>680</width>
+    <height>330</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_325</name>
-    <text>Charge</text>
-    <x>14</x>
-    <y>549</y>
-    <width>405</width>
-    <height>128</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <x>50</x>
+    <y>90</y>
+    <width>680</width>
+    <height>330</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
+    <corner_height>10</corner_height>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_274</name>
-    <text>Flat top</text>
-    <x>1298</x>
-    <y>44</y>
-    <width>571</width>
-    <height>769</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_4</name>
+    <x>50</x>
+    <y>90</y>
+    <width>680</width>
+    <height>30</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_137</name>
-    <text>Pulse</text>
-    <x>432</x>
-    <y>44</y>
-    <width>857</width>
-    <height>770</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
-    <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_1</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_7</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>1</value>
+      </action>
     </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <text>Start</text>
+    <x>272</x>
+    <y>285</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_129</name>
-    <text>General</text>
-    <x>14</x>
-    <y>44</y>
-    <width>405</width>
-    <height>495</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
+    </foreground_color>
     <background_color>
-      <color name="IO Area Background" red="221" green="223" blue="229">
+      <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_8</name>
     <actions>
+      <action type="write_pv">
+        <pv_name>$(pv_name)</pv_name>
+        <value>0</value>
+      </action>
     </actions>
-    <border_width>2</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <text>Stop</text>
+    <x>391</x>
+    <y>284</y>
+    <width>79</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
+    </foreground_color>
+    <background_color>
+      <color red="240" green="240" blue="240">
+      </color>
+    </background_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <text>Flat top region of interest (cursors)</text>
-    <x>444</x>
-    <y>517</y>
-    <width>411</width>
-    <height>180</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="led" version="2.0.0">
+    <name>LED_2</name>
+    <pv_name>$(P)$(R)Acquire</pv_name>
+    <x>240</x>
+    <y>130</y>
+    <width>21</width>
+    <height>21</height>
+    <off_color>
+      <color name="IO Background" red="235" green="235" blue="235">
+      </color>
+    </off_color>
+    <on_color>
+      <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+      </color>
+    </on_color>
+    <foreground_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </foreground_color>
+    <line_color>
+      <color red="150" green="150" blue="150">
+      </color>
+    </line_color>
     <actions>
     </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_23</name>
-    <text>$(P)</text>
-    <x>13</x>
-    <y>7</y>
-    <width>1877</width>
-    <height>29</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
-      </font>
-    </font>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_41</name>
+    <pv_name>$(P)$(R)Acquire_RBV</pv_name>
+    <x>285</x>
+    <y>130</y>
+    <width>259</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color name="IO Focus Entry" red="198" green="217" blue="241">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>false</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
+    <transparent>true</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_width>1</border_width>
     <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+      <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_39</name>
-    <pv_name>$(P)$(R)ROI3-MinX_RBV</pv_name>
-    <x>669</x>
-    <y>573</y>
-    <width>70</width>
+    <name>Text Update_45</name>
+    <pv_name>$(P)$(R)NumSamplesR</pv_name>
+    <x>480</x>
+    <y>209</y>
+    <width>208</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
@@ -207,40 +188,49 @@
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_131</name>
-    <text>Start</text>
-    <x>452</x>
-    <y>573</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_3</name>
+    <pv_name>$(P)$(R)NumSamples</pv_name>
+    <x>275</x>
+    <y>210</y>
+    <width>180</width>
+    <format>0</format>
+    <precision>3</precision>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <actions>
     </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
+    <minimum>-1.7976931348623157E308</minimum>
+    <maximum>1.7976931348623157E308</maximum>
+    <increment>100.0</increment>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_133</name>
-    <text>Pulse</text>
-    <x>25</x>
-    <y>590</y>
-    <width>163</width>
-    <height>76</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_51</name>
+    <pv_name>$(P)$(R)ArrayCounter_RBV</pv_name>
+    <x>275</x>
+    <y>248</y>
+    <width>232</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
     </actions>
-    <border_width>1</border_width>
     <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
+      <color red="0" green="128" blue="255">
       </color>
     </border_color>
   </widget>
@@ -270,131 +260,21 @@ $(pv_value)</tooltip>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
   </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>XY Graph_2</name>
-    <x>443</x>
-    <y>76</y>
-    <width>836</width>
-    <height>436</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <title_font>
-      <font family="Arial" style="BOLD" size="11.881188118811881">
-      </font>
-    </title_font>
-    <show_toolbar>true</show_toolbar>
-    <actions>
-    </actions>
-    <rules>
-      <rule name="y_max" prop_id="axis_1_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)TRC2-ArraySize1_RBV</pv_name>
-      </rule>
-      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
-        <exp bool_exp="pv0==1">
-          <expression>"mA"</expression>
-        </exp>
-        <exp bool_exp="pv0==0">
-          <expression>"ADC counts"</expression>
-        </exp>
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-      </rule>
-      <rule name="samples_x_max" prop_id="axis_0_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name>
-      </rule>
-    </rules>
-    <x_axis>
-      <title>Samples</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>true</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>ADC counts</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>true</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>Pulse</name>
-        <x_pv></x_pv>
-        <y_pv>$(P)$(R)TRC2-ArrayData</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="0" green="0" blue="255">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>3</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-    <marker>
-      <marker>
-        <color>
-          <color name="ERROR" red="252" green="13" blue="27">
-          </color>
-        </color>
-        <pv_name>$(P)$(R)ROI3-MinX</pv_name>
-        <interactive>true</interactive>
-      </marker>
-      <marker>
-        <color>
-          <color name="ATTENTION" red="252" green="242" blue="17">
-          </color>
-        </color>
-        <pv_name>$(P)$(R)ROI3-EndX</pv_name>
-        <interactive>true</interactive>
-      </marker>
-    </marker>
-  </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>Text Update_52</name>
-    <pv_name>$(P)$(R)TRC2-ArrayCounter_RBV</pv_name>
-    <x>442</x>
-    <y>732</y>
-    <width>74</width>
+    <name>Text Update_60</name>
+    <pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
+    <x>285</x>
+    <y>165</y>
+    <width>209</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <transparent>true</transparent>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -405,32 +285,20 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_148</name>
-    <text>Counter</text>
-    <x>443</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_157</name>
+    <text>Rate:</text>
+    <x>165</x>
+    <y>172</y>
+    <width>54</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_62</name>
-    <pv_name>$(P)$(R)TRC2-ArrayRate_RBV</pv_name>
-    <x>616</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -441,32 +309,20 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_160</name>
-    <text>Rate</text>
-    <x>617</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_158</name>
+    <text>Status:</text>
+    <x>99</x>
+    <y>130</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_64</name>
-    <pv_name>$(P)$(R)TRC2-EnableCallbacks_RBV</pv_name>
-    <x>529</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -477,32 +333,20 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_162</name>
-    <text>Status</text>
-    <x>530</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_163</name>
+    <text>Pulse counter:</text>
+    <x>100</x>
+    <y>253</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_66</name>
-    <pv_name>$(P)$(R)TRC2-DroppedArrays_RBV</pv_name>
-    <x>703</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -513,11 +357,19 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_165</name>
-    <text>Dropped</text>
-    <x>704</x>
-    <y>708</y>
-    <width>72</width>
+    <name>Label_166</name>
+    <text>Samples number:</text>
+    <x>100</x>
+    <y>213</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
@@ -528,166 +380,43 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>XY Graph_3</name>
-    <x>1308</x>
-    <y>432</y>
-    <width>547</width>
-    <height>283</height>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_69</name>
+    <pv_name>$(P)$(R)MessageR</pv_name>
+    <x>272</x>
+    <y>377</y>
+    <width>119</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <title_font>
-      <font family="Arial" style="BOLD" size="11.881188118811881">
-      </font>
-    </title_font>
-    <show_toolbar>true</show_toolbar>
+    <format>6</format>
     <actions>
     </actions>
-    <rules>
-      <rule name="Trace0" prop_id="trace_0_visible" out_exp="true">
-        <exp bool_exp="pv0==0">
-          <expression>false</expression>
-        </exp>
-        <pv_name>loc://Mean</pv_name>
-      </rule>
-      <rule name="Trace1" prop_id="trace_1_visible" out_exp="true">
-        <exp bool_exp="pv0==0">
-          <expression>false</expression>
-        </exp>
-        <pv_name>loc://Max</pv_name>
-      </rule>
-      <rule name="Trace2" prop_id="trace_2_visible" out_exp="true">
-        <exp bool_exp="pv0==0">
-          <expression>false</expression>
-        </exp>
-        <pv_name>loc://Min</pv_name>
-      </rule>
-      <rule name="AutoScale0" prop_id="axis_0_auto_scale" out_exp="true">
-        <exp bool_exp="true">
-          <expression>true</expression>
-        </exp>
-        <pv_name>loc://Min</pv_name>
-      </rule>
-      <rule name="AutoScale1" prop_id="axis_1_auto_scale" out_exp="true">
-        <exp bool_exp="true">
-          <expression>true</expression>
-        </exp>
-        <pv_name>loc://Min</pv_name>
-      </rule>
-      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
-        <exp bool_exp="pv0==1">
-          <expression>"mA"</expression>
-        </exp>
-        <exp bool_exp="pv0==0">
-          <expression>"ADC counts"</expression>
-        </exp>
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-      </rule>
-    </rules>
-    <x_axis>
-      <title>Pulse</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>1000.0</maximum>
-      <show_grid>true</show_grid>
-      <title_font>
-        <font family="Arial" style="BOLD" size="8.910891089108912">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>ADC counts</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>60000.0</maximum>
-        <show_grid>true</show_grid>
-        <title_font>
-          <font family="Arial" style="BOLD" size="8.910891089108912">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>Mean</name>
-        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)STAT3-TSMeanValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="75" green="110" blue="199">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-      <trace>
-        <name>Max</name>
-        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)STAT3-TSMaxValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="242" green="26" blue="26">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-      <trace>
-        <name>Min</name>
-        <x_pv>$(P)$(R)STAT3-TSTimestamp</x_pv>
-        <y_pv>$(P)$(R)STAT3-TSMinValue</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="33" green="179" blue="33">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_71</name>
-    <pv_name>$(P)$(R)ROI3-TickFirstUsR</pv_name>
-    <x>753</x>
-    <y>573</y>
-    <width>94</width>
+  <widget type="label" version="2.0.0">
+    <name>Label_271</name>
+    <text>Acquisition control:</text>
+    <x>77</x>
+    <y>292</y>
+    <width>145</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -697,17 +426,21 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_73</name>
-    <pv_name>$(P)$(R)STAT3-TS-TSCurrentPoint</pv_name>
-    <x>1769</x>
-    <y>732</y>
-    <width>86</width>
+  <widget type="label" version="2.0.0">
+    <name>Label_273</name>
+    <text>Acquisition status:</text>
+    <x>60</x>
+    <y>377</y>
+    <width>155</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
+    <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -717,1231 +450,73 @@ $(pv_value)</tooltip>
       </color>
     </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_206</name>
-    <text>Current Point</text>
-    <x>1666</x>
-    <y>732</y>
-    <width>91</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="checkbox" version="2.0.0">
-    <name>Check Box</name>
-    <pv_name>loc://Min(1)</pv_name>
-    <label>Min</label>
-    <x>1606</x>
-    <y>763</y>
-    <width>68</width>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="checkbox" version="2.0.0">
-    <name>Check Box_1</name>
-    <pv_name>loc://Mean(1)</pv_name>
-    <label>Average</label>
-    <x>1515</x>
-    <y>763</y>
-    <width>77</width>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="checkbox" version="2.0.0">
-    <name>Check Box_2</name>
-    <pv_name>loc://Max(1)</pv_name>
-    <label>Max</label>
-    <x>1437</x>
-    <y>763</y>
-    <width>68</width>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_207</name>
-    <text>Trace visibility</text>
-    <x>1334</x>
-    <y>763</y>
-    <width>91</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_74</name>
-    <pv_name>$(P)$(R)STAT3-TS-TSAcquiring</pv_name>
-    <x>1539</x>
-    <y>732</y>
-    <width>86</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_258</name>
-    <text>Binning</text>
-    <x>452</x>
-    <y>647</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_81</name>
-    <pv_name>$(P)$(R)ROI3-BinX_RBV</pv_name>
-    <x>669</x>
-    <y>647</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_82</name>
-    <pv_name>$(P)$(R)ROI3-BinXTimeUsR</pv_name>
-    <x>753</x>
-    <y>647</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_259</name>
-    <text>Total</text>
-    <x>452</x>
-    <y>673</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_83</name>
-    <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name>
-    <x>669</x>
-    <y>673</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_34</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)STAT3-TS-TSAcquire</pv_name>
-    <text>(Re)start</text>
-    <x>1341</x>
-    <y>730</y>
-    <width>79</width>
-    <height>24</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_35</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)STAT3-TS-TSAcquire</pv_name>
-    <text>Stop</text>
-    <x>1432</x>
-    <y>730</y>
-    <width>79</width>
-    <height>24</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="xyplot" version="2.0.0">
-    <name>XY Graph_4</name>
-    <x>1308</x>
-    <y>76</y>
-    <width>547</width>
-    <height>355</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <title_font>
-      <font family="Arial" style="BOLD" size="11.881188118811881">
-      </font>
-    </title_font>
-    <show_toolbar>true</show_toolbar>
-    <actions>
-    </actions>
-    <rules>
-      <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)TRC3-ArraySize1_RBV</pv_name>
-      </rule>
-      <rule name="data_x_max" prop_id="axis_0_maximum" out_exp="true">
-        <exp bool_exp="true">
-          <expression>pv0</expression>
-        </exp>
-        <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name>
-      </rule>
-      <rule name="Y title" prop_id="axis_1_axis_title" out_exp="true">
-        <exp bool_exp="pv0==1">
-          <expression>"mA"</expression>
-        </exp>
-        <exp bool_exp="pv0==0">
-          <expression>"ADC counts"</expression>
-        </exp>
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-      </rule>
-    </rules>
-    <x_axis>
-      <title>Samples</title>
-      <autoscale>true</autoscale>
-      <log_scale>false</log_scale>
-      <minimum>0.0</minimum>
-      <maximum>100.0</maximum>
-      <show_grid>true</show_grid>
-      <title_font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-        </font>
-      </scale_font>
-      <visible>true</visible>
-    </x_axis>
-    <y_axes>
-      <y_axis>
-        <title>ADC counts</title>
-        <autoscale>true</autoscale>
-        <log_scale>false</log_scale>
-        <minimum>0.0</minimum>
-        <maximum>100.0</maximum>
-        <show_grid>true</show_grid>
-        <title_font>
-          <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-          </font>
-        </title_font>
-        <scale_font>
-          <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
-          </font>
-        </scale_font>
-        <visible>true</visible>
-      </y_axis>
-    </y_axes>
-    <traces>
-      <trace>
-        <name>Flat top</name>
-        <x_pv></x_pv>
-        <y_pv>$(P)$(R)TRC3-ArrayData</y_pv>
-        <err_pv></err_pv>
-        <axis>0</axis>
-        <trace_type>1</trace_type>
-        <color>
-          <color red="21" green="21" blue="196">
-          </color>
-        </color>
-        <line_width>1</line_width>
-        <line_style>0</line_style>
-        <point_type>0</point_type>
-        <point_size>4</point_size>
-        <visible>true</visible>
-      </trace>
-    </traces>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_298</name>
-    <text>Size</text>
-    <x>452</x>
-    <y>596</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_91</name>
-    <pv_name>$(P)$(R)ROI3-SizeX_RBV</pv_name>
-    <x>669</x>
-    <y>596</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_92</name>
-    <pv_name>$(P)$(R)ROI3-TickCountUsR</pv_name>
-    <x>753</x>
-    <y>596</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_93</name>
-    <pv_name>$(P)$(R)ROI3-TotalXTimeUsR</pv_name>
-    <x>753</x>
-    <y>673</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_306</name>
-    <text>Sample no.</text>
-    <x>564</x>
-    <y>547</y>
-    <width>174</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_308</name>
-    <text>Time</text>
-    <x>753</x>
-    <y>547</y>
-    <width>93</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_309</name>
-    <text>End</text>
-    <x>452</x>
-    <y>620</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_95</name>
-    <pv_name>$(P)$(R)ROI3-TickLastUsR</pv_name>
-    <x>753</x>
-    <y>620</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_96</name>
-    <pv_name>$(P)$(R)PulseChargeUcR</pv_name>
-    <x>42</x>
-    <y>620</y>
-    <width>128</width>
-    <height>37</height>
-    <font>
-      <font family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_97</name>
-    <pv_name>$(P)$(R)STAT3-MinValueR</pv_name>
-    <x>134</x>
-    <y>774</y>
-    <width>128</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-        <pv_name trigger="false">$(pv_name).EGU</pv_name>
-      </script>
-    </scripts>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_311</name>
-    <text>Maximum</text>
-    <x>38</x>
-    <y>720</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_98</name>
-    <pv_name>$(P)$(R)STAT3-MeanValueR</pv_name>
-    <x>134</x>
-    <y>746</y>
-    <width>128</width>
-    <foreground_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-        <pv_name trigger="false">$(pv_name).EGU</pv_name>
-      </script>
-    </scripts>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_312</name>
-    <text>Average</text>
-    <x>38</x>
-    <y>746</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_99</name>
-    <pv_name>$(P)$(R)STAT3-MaxValueR</pv_name>
-    <x>134</x>
-    <y>720</y>
-    <width>128</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <scripts>
-      <script file="change_stats_units.js">
-        <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name>
-        <pv_name trigger="false">$(pv_name).EGU</pv_name>
-      </script>
-    </scripts>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_313</name>
-    <text>Minimum</text>
-    <x>38</x>
-    <y>774</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_315</name>
-    <text>Flat top</text>
-    <x>241</x>
-    <y>590</y>
-    <width>163</width>
-    <height>76</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_101</name>
-    <pv_name>$(P)$(R)FlatTopChargeUcR</pv_name>
-    <x>259</x>
-    <y>620</y>
-    <width>128</width>
-    <height>37</height>
-    <font>
-      <font family="Source Sans Pro" style="BOLD" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="Major" red="250" green="12" blue="14">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_317</name>
-    <text>Pulse region of interest (limits)</text>
-    <x>867</x>
-    <y>517</y>
-    <width>411</width>
-    <height>180</height>
-    <font>
-      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_width>1</border_width>
-    <border_color>
-      <color name="IO Border" red="0" green="0" blue="0">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_102</name>
-    <pv_name>$(P)$(R)ROI2-MinX_RBV</pv_name>
-    <x>1092</x>
-    <y>573</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_318</name>
-    <text>Start</text>
-    <x>875</x>
-    <y>573</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_103</name>
-    <pv_name>$(P)$(R)ROI2-TickFirstUsR</pv_name>
-    <x>1176</x>
-    <y>573</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_319</name>
-    <text>Binning</text>
-    <x>875</x>
-    <y>647</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_104</name>
-    <pv_name>$(P)$(R)ROI2-BinX_RBV</pv_name>
-    <x>1092</x>
-    <y>647</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_105</name>
-    <pv_name>$(P)$(R)ROI2-BinXTimeUsR</pv_name>
-    <x>1176</x>
-    <y>647</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_320</name>
-    <text>Total</text>
-    <x>875</x>
-    <y>673</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_106</name>
-    <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name>
-    <x>1092</x>
-    <y>673</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_321</name>
-    <text>Size</text>
-    <x>875</x>
-    <y>596</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_107</name>
-    <pv_name>$(P)$(R)ROI2-SizeX_RBV</pv_name>
-    <x>1092</x>
-    <y>596</y>
-    <width>70</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_108</name>
-    <pv_name>$(P)$(R)ROI2-TickCountUsR</pv_name>
-    <x>1176</x>
-    <y>596</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_109</name>
-    <pv_name>$(P)$(R)ROI2-TotalXTimeUsR</pv_name>
-    <x>1176</x>
-    <y>673</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_322</name>
-    <text>Sample no.</text>
-    <x>987</x>
-    <y>547</y>
-    <width>174</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_323</name>
-    <text>Time</text>
-    <x>1176</x>
-    <y>547</y>
-    <width>93</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_324</name>
-    <text>End</text>
-    <x>875</x>
-    <y>620</y>
-    <width>98</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_111</name>
-    <pv_name>$(P)$(R)ROI2-TickLastUsR</pv_name>
-    <x>1176</x>
-    <y>620</y>
-    <width>94</width>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_49</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDROI.opi</file>
-        <macros>
-          <R>ROI2-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>ROI 2</text>
-    <x>440</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_50</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDTrace.opi</file>
-        <macros>
-          <R>TRC2-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Trace 2</text>
-    <x>628</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_51</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDStats.opi</file>
-        <macros>
-          <R>STAT3-</R>
-          <S>TS3-</S>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Statistics 3</text>
-    <x>1116</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_52</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDPluginTimeSeries.opi</file>
-        <macros>
-          <R>STAT3-TS-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Trends 3</text>
-    <x>1199</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_53</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDProcess.opi</file>
-        <macros>
-          <R>PROC2-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Process 2</text>
-    <x>534</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_54</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDCircularBuff.opi</file>
-        <macros>
-          <R>CB1-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Circ Buff 1</text>
-    <x>223</x>
-    <y>126</y>
-    <width>79</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_55</name>
-    <actions>
-      <action type="open_display">
-        <file>../adcore/NDROI.opi</file>
-        <macros>
-          <R>ROI3-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>ROI 3</text>
-    <x>867</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_56</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDTrace.opi</file>
-        <macros>
-          <R>TRC3-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Trace 3</text>
-    <x>1033</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
-      </color>
-    </background_color>
-    <tooltip>$(actions)</tooltip>
-  </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_57</name>
+    <name>Action Button_47</name>
     <actions>
-      <action type="open_display">
-        <file>../admisc/NDProcess.opi</file>
-        <macros>
-          <R>PROC3-</R>
-        </macros>
+      <action type="open_display">
+        <file>../adsis8300/system.opi</file>
         <target>tab</target>
       </action>
     </actions>
-    <text>Process 3</text>
-    <x>950</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
+    <text>System</text>
+    <x>273</x>
+    <y>331</y>
+    <width>80</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_58</name>
-    <actions>
-      <action type="open_display">
-        <file>../admisc/NDTrace.opi</file>
-        <macros>
-          <R>TRC1-</R>
-        </macros>
-        <target>tab</target>
-      </action>
-    </actions>
-    <text>Trace 1</text>
-    <x>134</x>
-    <y>126</y>
-    <width>79</width>
-    <height>25</height>
+  <widget type="label" version="2.0.0">
+    <name>Label_307</name>
+    <text>System settings:</text>
+    <x>60</x>
+    <y>332</y>
+    <width>160</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="240" green="240" blue="240">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <tooltip>$(actions)</tooltip>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_59</name>
+    <name>Action Button_48</name>
     <actions>
       <action type="open_display">
-        <file>../admisc/NDProcess.opi</file>
+        <file>channel.opi</file>
         <macros>
-          <R>PROC1-</R>
+          <CH>CH1</CH>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>Process 1</text>
-    <x>42</x>
-    <y>126</y>
-    <width>79</width>
-    <height>25</height>
+    <text>LEBT FC</text>
+    <x>99</x>
+    <y>509</y>
+    <width>152</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
@@ -1949,246 +524,97 @@ $(pv_value)</tooltip>
     <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_60</name>
+    <name>Action Button_49</name>
     <actions>
       <action type="open_display">
-        <file>../adcore/NDFileHDF5.opi</file>
+        <file>channel.opi</file>
         <macros>
-          <R>HDF1-</R>
+          <CH>CH2</CH>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>HDF5 1</text>
-    <x>318</x>
-    <y>126</y>
-    <width>79</width>
-    <height>25</height>
+    <text>MEBT FC</text>
+    <x>100</x>
+    <y>561</y>
+    <width>152</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_5</name>
-    <pv_name>$(P)$(R)ROI3-MinX</pv_name>
-    <x>563</x>
-    <y>568</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-  </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_6</name>
-    <pv_name>$(P)$(R)ROI3-SizeX</pv_name>
-    <x>563</x>
-    <y>593</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-  </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_7</name>
-    <pv_name>$(P)$(R)ROI3-BinX</pv_name>
-    <x>563</x>
-    <y>644</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-    <limits_from_pv>false</limits_from_pv>
-  </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_8</name>
-    <pv_name>$(P)$(R)ROI2-MinX</pv_name>
-    <x>985</x>
-    <y>570</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-  </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_9</name>
-    <pv_name>$(P)$(R)ROI2-SizeX</pv_name>
-    <x>985</x>
-    <y>593</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-  </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_10</name>
-    <pv_name>$(P)$(R)ROI2-BinX</pv_name>
-    <x>985</x>
-    <y>644</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
-    <limits_from_pv>false</limits_from_pv>
-  </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_64</name>
+    <name>Action Button_50</name>
     <actions>
       <action type="open_display">
-        <file>../admisc/NDStats.opi</file>
+        <file>channel.opi</file>
         <macros>
-          <R>STAT2-</R>
+          <CH>CH3</CH>
         </macros>
         <target>tab</target>
       </action>
     </actions>
-    <text>Statistics 2</text>
-    <x>722</x>
-    <y>765</y>
-    <width>77</width>
-    <height>25</height>
+    <text>DTL FC2</text>
+    <x>100</x>
+    <y>609</y>
+    <width>152</width>
+    <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
     <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_334</name>
-    <text>System control</text>
-    <x>26</x>
-    <y>76</y>
-    <width>141</width>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button_65</name>
+    <name>Action Button_51</name>
     <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>1</value>
+      <action type="open_display">
+        <file>channel.opi</file>
+        <macros>
+          <CH>CH4</CH>
+        </macros>
+        <target>tab</target>
       </action>
     </actions>
-    <pv_name>$(P)$(R)Control</pv_name>
-    <text>Enable</text>
-    <x>240</x>
-    <y>76</y>
-    <width>61</width>
+    <text>DTL FC4</text>
+    <x>101</x>
+    <y>659</y>
+    <width>151</width>
     <height>20</height>
-    <background_color>
-      <color red="240" green="240" blue="240">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </background_color>
-  </widget>
-  <widget type="action_button" version="3.0.0">
-    <name>Action Button_66</name>
-    <actions>
-      <action type="write_pv">
-        <pv_name>$(pv_name)</pv_name>
-        <value>0</value>
-      </action>
-    </actions>
-    <pv_name>$(P)$(R)Control</pv_name>
-    <text>Disable</text>
-    <x>306</x>
-    <y>76</y>
-    <width>67</width>
-    <height>20</height>
+    </foreground_color>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_2</name>
-    <pv_name>$(P)$(R)ControlR</pv_name>
-    <x>178</x>
-    <y>78</y>
-    <width>16</width>
-    <height>16</height>
-    <off_color>
-      <color name="IO Background" red="235" green="235" blue="235">
-      </color>
-    </off_color>
+  <widget type="label" version="2.0.0">
+    <name>Label_309</name>
+    <text>LEBT-010:PBI-FC-001</text>
+    <x>320</x>
+    <y>514</y>
+    <width>234</width>
     <foreground_color>
-      <color red="192" green="192" blue="192">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <line_color>
-      <color red="150" green="150" blue="150">
-      </color>
-    </line_color>
-    <actions>
-    </actions>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_112</name>
-    <pv_name>$(P)$(R)TRC3-ArrayCounter_RBV</pv_name>
-    <x>866</x>
-    <y>732</y>
-    <width>74</width>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2199,32 +625,19 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_365</name>
-    <text>Counter</text>
-    <x>867</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_310</name>
+    <text>MEBT-010:PBI-FC-001</text>
+    <x>320</x>
+    <y>560</y>
+    <width>212</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_113</name>
-    <pv_name>$(P)$(R)TRC3-ArrayRate_RBV</pv_name>
-    <x>1040</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2235,32 +648,19 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_366</name>
-    <text>Rate</text>
-    <x>1041</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_311</name>
+    <text>DTL-020:PBI-FC-001</text>
+    <x>320</x>
+    <y>610</y>
+    <width>212</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_114</name>
-    <pv_name>$(P)$(R)TRC3-EnableCallbacks_RBV</pv_name>
-    <x>953</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2271,32 +671,19 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_367</name>
-    <text>Status</text>
-    <x>954</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+    <name>Label_312</name>
+    <text>DTL-040:PBI-FC-001</text>
+    <x>320</x>
+    <y>659</y>
+    <width>171</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_115</name>
-    <pv_name>$(P)$(R)TRC3-DroppedArrays_RBV</pv_name>
-    <x>1127</x>
-    <y>732</y>
-    <width>74</width>
+    </foreground_color>
     <background_color>
       <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
     <actions>
@@ -2307,55 +694,72 @@ $(pv_value)</tooltip>
     </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label_368</name>
-    <text>Dropped</text>
-    <x>1128</x>
-    <y>708</y>
-    <width>72</width>
-    <horizontal_alignment>1</horizontal_alignment>
+    <name>title</name>
+    <text>$(TITLE) // $(SYSTEM)</text>
+    <x>25</x>
+    <width>775</width>
+    <height>50</height>
+    <font>
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color>
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <vertical_alignment>1</vertical_alignment>
     <wrap_words>false</wrap_words>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <class>GROUP-TITLE</class>
+    <text>Acquisition</text>
+    <x>50</x>
+    <y>90</y>
+    <width>680</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
       </color>
-    </border_color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_11</name>
-    <pv_name>$(P)$(R)ROI3-EndX</pv_name>
-    <x>563</x>
-    <y>618</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_5</name>
+    <x>50</x>
+    <y>440</y>
+    <width>680</width>
+    <height>30</height>
+    <line_width>0</line_width>
     <background_color>
-      <color red="255" green="255" blue="255">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
   </widget>
-  <widget type="spinner" version="2.0.0">
-    <name>Spinner_12</name>
-    <pv_name>$(P)$(R)ROI2-EndX</pv_name>
-    <x>985</x>
-    <y>618</y>
-    <width>99</width>
-    <height>25</height>
-    <format>0</format>
-    <precision>3</precision>
-    <background_color>
-      <color red="255" green="255" blue="255">
+  <widget type="label" version="2.0.0">
+    <name>Label_313</name>
+    <class>GROUP-TITLE</class>
+    <text>Channels</text>
+    <x>50</x>
+    <y>440</y>
+    <width>680</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
       </color>
-    </background_color>
-    <actions>
-    </actions>
-    <minimum>-1.7976931348623157E308</minimum>
-    <maximum>1.7976931348623157E308</maximum>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynGPIBSetup.bob b/99-Shared/asyn/asynGPIBSetup.bob
index 08dc6f1f2c89e43822e0b9232f561d347ea27f32..62cb63ef943d5948ab0553eaa861a3a9fe5802a8 100644
--- a/99-Shared/asyn/asynGPIBSetup.bob
+++ b/99-Shared/asyn/asynGPIBSetup.bob
@@ -4,207 +4,350 @@
   <x>456</x>
   <y>239</y>
   <width>375</width>
-  <height>185</height>
+  <height>220</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>8</y>
+    <name>BGGrey02-background</name>
+    <y>50</y>
     <width>375</width>
-    <height>29</height>
+    <height>170</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>375</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
     <text>$(P)$(R)</text>
     <y>12</y>
     <width>375</width>
     <height>25</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="14.851485148514852">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
+    <name>Label</name>
     <text>GPIB address:</text>
-    <x>4</x>
-    <y>68</y>
+    <x>61</x>
+    <y>92</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #15</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).ADDR</pv_name>
-    <x>139</x>
-    <y>68</y>
-    <width>75</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>224</x>
+    <y>88</y>
+    <width>135</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #19</name>
+    <name>Label</name>
     <text>Serial poll response:</text>
-    <x>4</x>
-    <y>97</y>
-    <width>210</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <y>120</y>
+    <width>191</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #22</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).SPR</pv_name>
-    <x>224</x>
-    <y>97</y>
-    <width>56</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>225</x>
+    <y>117</y>
+    <width>135</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>4</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
-    <text>Universal Command</text>
-    <x>4</x>
-    <y>126</y>
+    <name>Label</name>
+    <text>Universal Command:</text>
+    <x>23</x>
+    <y>150</y>
     <width>170</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #29</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).UCMD</pv_name>
-    <x>179</x>
-    <y>126</y>
-    <width>180</width>
+    <x>224</x>
+    <y>145</y>
+    <width>135</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #32</name>
-    <text>Addressed Command</text>
-    <x>4</x>
-    <y>151</y>
+    <name>Label</name>
+    <text>Addressed Command:</text>
+    <x>22</x>
+    <y>182</y>
     <width>170</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #35</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).ACMD</pv_name>
-    <x>179</x>
-    <y>151</y>
-    <width>180</width>
+    <x>224</x>
+    <y>175</y>
+    <width>135</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #38</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>218</x>
-    <y>42</y>
+    <x>250</x>
+    <y>60</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).GPIBIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #42</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>208</x>
-    <y>42</y>
+    <x>240</x>
+    <y>60</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).GPIBIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #46</name>
+    <name>Label</name>
     <text>asynGpib interface:</text>
-    <x>4</x>
-    <y>42</y>
+    <x>2</x>
+    <y>60</y>
     <width>190</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynIPPortSetup.bob b/99-Shared/asyn/asynIPPortSetup.bob
index 4a0a022766b7901722f26e3975142c7fc0b6ef48..c0ea60e6287f12503a496f6abc88eebd36b43ef6 100644
--- a/99-Shared/asyn/asynIPPortSetup.bob
+++ b/99-Shared/asyn/asynIPPortSetup.bob
@@ -3,417 +3,722 @@
   <name>asynIPPortSetup</name>
   <x>405</x>
   <y>149</y>
-  <width>260</width>
-  <height>410</height>
+  <width>280</width>
+  <height>470</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>2</y>
-    <width>260</width>
-    <height>16</height>
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>280</width>
+    <height>420</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>280</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>2</y>
-    <width>260</width>
-    <height>16</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>280</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <horizontal_alignment>1</horizontal_alignment>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>148</x>
-    <y>25</y>
+    <x>140</x>
+    <y>60</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OPTIONIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>138</x>
-    <y>25</y>
+    <x>130</x>
+    <y>60</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OPTIONIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #20</name>
+    <name>Label</name>
     <text>asynOption:</text>
-    <x>8</x>
-    <y>25</y>
+    <y>60</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #23</name>
+    <name>Label</name>
     <text>Disconnect on</text>
-    <x>13</x>
-    <y>51</y>
+    <x>5</x>
+    <y>86</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
+    <name>Label</name>
     <text>read timeout:</text>
-    <x>13</x>
-    <y>76</y>
+    <x>5</x>
+    <y>111</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
+    <name>Label</name>
     <text>Host info:</text>
-    <x>43</x>
-    <y>101</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>35</x>
+    <y>136</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #32</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).HOSTINFO</pv_name>
-    <x>150</x>
-    <y>101</y>
+    <x>142</x>
+    <y>136</y>
     <width>102</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #36</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).DRTO</pv_name>
-    <x>150</x>
-    <y>76</y>
+    <x>142</x>
+    <y>111</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #39</name>
+    <name>Label</name>
     <text>Data bits:</text>
-    <x>43</x>
-    <y>206</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>35</x>
+    <y>241</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #42</name>
+    <name>Label</name>
     <text>Stop bits:</text>
-    <x>43</x>
-    <y>231</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>35</x>
+    <y>266</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
+    <name>Label</name>
     <text>Modem control:</text>
-    <x>3</x>
-    <y>281</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>316</y>
+    <width>135</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
+    <name>Label</name>
     <text>Parity:</text>
-    <x>73</x>
-    <y>256</y>
+    <x>65</x>
+    <y>291</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #51</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).DBIT</pv_name>
-    <x>150</x>
-    <y>206</y>
+    <x>142</x>
+    <y>241</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #54</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).SBIT</pv_name>
-    <x>150</x>
-    <y>231</y>
+    <x>142</x>
+    <y>266</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #57</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).PRTY</pv_name>
-    <x>150</x>
-    <y>256</y>
+    <x>142</x>
+    <y>291</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #60</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).MCTL</pv_name>
-    <x>150</x>
-    <y>281</y>
+    <x>142</x>
+    <y>316</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #63</name>
+    <name>Label</name>
     <text>Flow control:</text>
-    <x>13</x>
-    <y>306</y>
+    <x>5</x>
+    <y>341</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #66</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).FCTL</pv_name>
-    <x>150</x>
-    <y>306</y>
+    <x>142</x>
+    <y>341</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #69</name>
+    <name>Label</name>
     <text>XOFF output:</text>
-    <x>23</x>
-    <y>331</y>
+    <x>15</x>
+    <y>366</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #72</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXON</pv_name>
-    <x>150</x>
-    <y>331</y>
+    <x>142</x>
+    <y>366</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #75</name>
+    <name>Label</name>
     <text>XOFF input:</text>
-    <x>33</x>
-    <y>356</y>
+    <x>25</x>
+    <y>391</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #78</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXOFF</pv_name>
-    <x>150</x>
-    <y>356</y>
+    <x>142</x>
+    <y>391</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #81</name>
+    <name>Label</name>
     <text>XON=any:</text>
-    <x>63</x>
-    <y>381</y>
+    <x>55</x>
+    <y>416</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #84</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXANY</pv_name>
-    <x>150</x>
-    <y>381</y>
+    <x>142</x>
+    <y>416</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #87</name>
+    <name>Label</name>
     <text>Baud rate:</text>
-    <x>43</x>
-    <y>181</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>35</x>
+    <y>216</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #90</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).LBAUD</pv_name>
-    <x>150</x>
-    <y>181</y>
+    <x>142</x>
+    <y>216</y>
     <width>102</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #94</name>
+    <name>Label</name>
     <text>COM (RFC 2217) protocol</text>
-    <x>15</x>
-    <y>151</y>
+    <x>7</x>
+    <y>186</y>
     <width>230</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #97</name>
+    <name>Label</name>
     <text>Parameters for ports with</text>
-    <x>5</x>
-    <y>130</y>
-    <width>250</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <y>170</y>
+    <width>200</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynOctet.bob b/99-Shared/asyn/asynOctet.bob
index 43736cc4fd236167f9404017f8acb306039071fa..e22387934a1fb9c54e718edd374b60bf2b96f3d1 100644
--- a/99-Shared/asyn/asynOctet.bob
+++ b/99-Shared/asyn/asynOctet.bob
@@ -3,763 +3,1128 @@
   <name>asynOctet</name>
   <x>457</x>
   <y>494</y>
-  <width>442</width>
-  <height>350</height>
+  <width>480</width>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>480</width>
+    <height>550</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_12</name>
+    <x>9</x>
+    <y>60</y>
+    <width>460</width>
+    <height>90</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_24</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_11</name>
+    <x>9</x>
+    <y>163</y>
+    <width>460</width>
+    <height>137</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_23</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_10</name>
+    <x>9</x>
+    <y>330</y>
+    <width>460</width>
+    <height>110</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_22</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_8</name>
+    <x>10</x>
+    <y>470</y>
+    <width>460</width>
+    <height>90</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_20</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_2</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>480</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #6</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).TINP</pv_name>
-    <x>81</x>
-    <y>216</y>
-    <width>350</width>
+    <x>161</x>
+    <y>212</y>
+    <width>299</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #10</name>
+    <name>Label</name>
     <text>Timeout (sec):</text>
-    <x>6</x>
-    <y>43</y>
-    <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <y>80</y>
+    <width>128</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #13</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).TMOT</pv_name>
-    <x>151</x>
-    <y>43</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>162</x>
+    <y>80</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #17</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).TMOD</pv_name>
-    <x>320</x>
-    <y>43</y>
-    <width>110</width>
+    <x>332</x>
+    <y>80</y>
+    <width>99</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #20</name>
+    <name>Label</name>
     <text>Transfer:</text>
-    <x>225</x>
-    <y>43</y>
+    <x>236</x>
+    <y>80</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #23</name>
-    <y>5</y>
-    <width>442</width>
-    <height>29</height>
-    <line_color>
-      <color red="218" green="218" blue="218">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
+    <name>Label</name>
     <text>$(P)$(R)</text>
-    <y>9</y>
-    <width>442</width>
-    <height>21</height>
+    <width>480</width>
+    <height>50</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #29</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).AOUT</pv_name>
-    <x>78</x>
-    <y>128</y>
-    <width>350</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>157</x>
+    <y>369</y>
+    <width>303</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #33</name>
-    <text>Output</text>
-    <x>13</x>
-    <y>99</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="88" green="147" blue="255">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </foreground_color>
-    <auto_size>true</auto_size>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #36</name>
+    <name>Label</name>
     <text>Format:</text>
-    <x>91</x>
-    <y>99</y>
+    <x>98</x>
+    <y>340</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #39</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).OFMT</pv_name>
-    <x>166</x>
-    <y>99</y>
-    <width>80</width>
+    <x>162</x>
+    <y>340</y>
+    <width>99</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #42</name>
+    <name>Label</name>
     <text>ASCII:</text>
-    <x>13</x>
-    <y>126</y>
+    <x>112</x>
+    <y>369</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #45</name>
-    <x>6</x>
-    <y>92</y>
-    <width>430</width>
-    <height>85</height>
-    <line_width>1</line_width>
-    <line_color>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
+    <name>Label</name>
     <text>Terminator:</text>
-    <x>256</x>
-    <y>99</y>
+    <x>268</x>
+    <y>340</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #51</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).OEOS</pv_name>
-    <x>371</x>
-    <y>99</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>361</x>
+    <y>340</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #55</name>
-    <text>Requested:</text>
-    <x>88</x>
-    <y>152</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #58</name>
-    <text>Length:</text>
-    <x>10</x>
-    <y>152</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text>Requested length:</text>
+    <x>30</x>
+    <y>405</y>
+    <width>142</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #61</name>
-    <text>Actual:</text>
-    <x>280</x>
-    <y>152</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text>Actual length:</text>
+    <x>290</x>
+    <y>403</y>
+    <width>105</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #64</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).NAWT</pv_name>
-    <x>355</x>
-    <y>152</y>
+    <x>404</x>
+    <y>402</y>
     <width>56</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #68</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).NOWT</pv_name>
-    <x>193</x>
-    <y>152</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>166</x>
+    <y>404</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #72</name>
+    <name>Label</name>
     <text>I/O Status:</text>
-    <x>10</x>
-    <y>297</y>
+    <x>45</x>
+    <y>494</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #75</name>
+    <name>Label</name>
     <text>I/O Severity:</text>
-    <x>217</x>
-    <y>297</y>
+    <x>223</x>
+    <y>494</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #78</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).STAT</pv_name>
-    <x>122</x>
-    <y>297</y>
-    <width>85</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>166</x>
+    <y>494</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #82</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).SEVR</pv_name>
-    <x>349</x>
-    <y>297</y>
-    <width>85</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>362</x>
+    <y>494</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #86</name>
-    <x>6</x>
-    <y>292</y>
-    <width>430</width>
-    <height>25</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Scan:</text>
+    <x>28</x>
+    <y>520</y>
+    <width>50</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #89</name>
-    <text>Scan:</text>
-    <x>9</x>
-    <y>323</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>2</horizontal_alignment>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #92</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).SCAN</pv_name>
-    <x>64</x>
-    <y>323</y>
+    <x>83</x>
+    <y>520</y>
     <width>110</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #95</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R).PROC</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R).PROC</pv_name>
     <text>Process</text>
-    <x>179</x>
-    <y>323</y>
+    <x>210</x>
+    <y>520</y>
     <width>80</width>
     <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </background_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #98</name>
-    <text>Terminator:</text>
-    <x>253</x>
-    <y>189</y>
-    <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #101</name>
-    <pv_name>$(P)$(R).IEOS</pv_name>
-    <x>368</x>
-    <y>189</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #105</name>
-    <x>74</x>
-    <y>213</y>
-    <width>360</width>
-    <height>21</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Terminator:</text>
+    <x>271</x>
+    <y>180</y>
+    <width>82</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #108</name>
-    <text>Input</text>
-    <x>16</x>
-    <y>189</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  <widget type="textentry" version="3.0.0">
+    <name>Text Input</name>
+    <pv_name>$(P)$(R).IEOS</pv_name>
+    <x>360</x>
+    <y>180</y>
+    <width>99</width>
     <foreground_color>
-      <color red="88" green="147" blue="255">
+      <color red="0" green="0" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <format>6</format>
+    <show_units>false</show_units>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #111</name>
+    <name>Label</name>
     <text>Format:</text>
-    <x>86</x>
-    <y>191</y>
+    <x>80</x>
+    <y>181</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #114</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IFMT</pv_name>
-    <x>161</x>
-    <y>189</y>
-    <width>80</width>
+    <x>159</x>
+    <y>181</y>
+    <width>99</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #117</name>
+    <name>Label</name>
     <text>ASCII:</text>
-    <x>13</x>
-    <y>215</y>
+    <x>89</x>
+    <y>212</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #120</name>
-    <x>6</x>
-    <y>182</y>
-    <width>430</width>
-    <height>105</height>
-    <line_width>1</line_width>
-    <line_color>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #123</name>
-    <text>Requested:</text>
-    <x>88</x>
-    <y>242</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text></text>
+    <x>89</x>
+    <y>238</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #126</name>
-    <text>Length:</text>
-    <x>10</x>
-    <y>242</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text>Requested length:</text>
+    <x>28</x>
+    <y>238</y>
+    <width>122</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #129</name>
-    <text>Actual:</text>
-    <x>280</x>
-    <y>242</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <name>Label</name>
+    <text>Actual length:</text>
+    <x>293</x>
+    <y>237</y>
+    <width>98</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #132</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).NORD</pv_name>
-    <x>355</x>
-    <y>242</y>
+    <x>403</x>
+    <y>238</y>
     <width>56</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="187" green="187" blue="187">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #136</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).NRRD</pv_name>
-    <x>193</x>
-    <y>242</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>161</x>
+    <y>237</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #140</name>
+    <name>Label</name>
     <text>EOM reason:</text>
-    <x>77</x>
-    <y>265</y>
+    <x>40</x>
+    <y>266</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #143</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).EOMR</pv_name>
-    <x>193</x>
-    <y>265</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>161</x>
+    <y>267</y>
+    <width>99</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #147</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>220</x>
-    <y>66</y>
+    <x>162</x>
+    <y>100</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OCTETIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #151</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>210</x>
-    <y>66</y>
+    <x>162</x>
+    <y>103</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OCTETIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #155</name>
+    <name>Label</name>
     <text>asynOctet interface:</text>
-    <x>6</x>
-    <y>66</y>
-    <width>200</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <y>103</y>
+    <width>147</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #158</name>
+    <name>Label</name>
     <text>Active</text>
-    <x>344</x>
-    <y>66</y>
+    <x>355</x>
+    <y>103</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #162</name>
+    <name>Label</name>
     <text>Inactive</text>
-    <x>334</x>
-    <y>66</y>
+    <x>345</x>
+    <y>103</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="!(pv0==0)">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(!(pv0==0))">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #166</name>
+    <name>Label</name>
     <text>More...</text>
-    <x>300</x>
-    <y>323</y>
+    <x>319</x>
+    <y>520</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #169</name>
+    <name>Menu Button</name>
     <actions>
       <action type="open_display">
         <file>asynRecord.opi</file>
@@ -782,14 +1147,46 @@
         <description>GPIB parameters</description>
       </action>
     </actions>
-    <text></text>
-    <x>375</x>
-    <y>323</y>
+    <text>Menu Button Label</text>
+    <x>394</x>
+    <y>520</y>
     <width>56</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_12</name>
+    <text>Input</text>
+    <y>133</y>
+    <width>440</width>
+    <height>30</height>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>BGGrey03-title_13</name>
+    <text>Output</text>
+    <x>6</x>
+    <y>310</y>
+    <width>440</width>
+    <height>30</height>
+    <foreground_color>
+      <color name="TEXT-LIGHT" red="230" green="230" blue="230">
+      </color>
+    </foreground_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynRecord.bob b/99-Shared/asyn/asynRecord.bob
index f28d1f76459e04c555c5fda8b5f1612cbac86025..58940941a15c0ec6262447cb4cc58146efa9c6a1 100644
--- a/99-Shared/asyn/asynRecord.bob
+++ b/99-Shared/asyn/asynRecord.bob
@@ -3,755 +3,1335 @@
   <name>asynRecord</name>
   <x>72</x>
   <y>61</y>
-  <width>440</width>
-  <height>589</height>
+  <width>600</width>
+  <height>700</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>8</y>
-    <width>440</width>
-    <height>29</height>
-    <line_color>
-      <color red="218" green="218" blue="218">
-      </color>
-    </line_color>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_8</name>
+    <x>18</x>
+    <y>61</y>
+    <width>525</width>
+    <height>166</height>
+    <style>3</style>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
     </background_color>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>$(P)$(R)</text>
-    <y>12</y>
-    <width>440</width>
-    <height>21</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #12</name>
-    <pv_name>$(P)$(R).ERRS</pv_name>
-    <x>75</x>
-    <y>182</y>
-    <width>359</width>
-    <height>16</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_7</name>
+    <x>18</x>
+    <y>250</y>
+    <width>525</width>
+    <height>120</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_19</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R).ERRS</pv_name>
+      <x>135</x>
+      <y>20</y>
+      <width>321</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Error:</text>
+      <x>52</x>
+      <y>20</y>
+      <width>60</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
       </font>
-    </font>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_6</name>
+    <x>18</x>
+    <y>390</y>
+    <width>525</width>
+    <height>265</height>
+    <style>3</style>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #16</name>
-    <text>Error:</text>
-    <x>10</x>
-    <y>181</y>
-    <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_18</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).TFIL</pv_name>
+      <x>141</x>
+      <y>230</y>
+      <width>322</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>6</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label</name>
+      <text>Trace file:</text>
+      <x>20</x>
+      <y>230</y>
+      <width>88</width>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).TMSK</pv_name>
+      <x>13</x>
+      <y>39</y>
+      <width>136</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
       </font>
-    </font>
-    <auto_size>true</auto_size>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>4</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).TIOM</pv_name>
+      <x>180</x>
+      <y>40</y>
+      <width>139</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>4</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).TINM</pv_name>
+      <x>360</x>
+      <y>39</y>
+      <width>103</width>
+      <font>
+        <font family="Sans" style="REGULAR" size="10.891089108910892">
+        </font>
+      </font>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>4</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
   </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #19</name>
-    <x>6</x>
-    <y>178</y>
-    <width>430</width>
-    <height>25</height>
-    <line_width>1</line_width>
+    <name>Rectangle_1</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>543</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
     <line_color>
-      <color red="0" green="0" blue="0">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
-    <background_color>
-      <color red="0" green="0" blue="0">
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
-    <transparent>true</transparent>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #22</name>
+    <name>Label</name>
     <text>noAutoConnect</text>
-    <x>300</x>
-    <y>212</y>
+    <x>338</x>
+    <y>310</y>
     <width>130</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="251" green="243" blue="74">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).AUCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #26</name>
+    <name>Label</name>
     <text>autoConnect</text>
-    <x>310</x>
-    <y>212</y>
+    <x>348</x>
+    <y>310</y>
     <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="60" green="180" blue="32">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).AUCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #30</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).AUCT</pv_name>
-    <x>305</x>
-    <y>233</y>
+    <x>343</x>
+    <y>331</y>
     <width>120</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #33</name>
+    <name>Label</name>
     <text>Enabled</text>
-    <x>180</x>
-    <y>212</y>
+    <x>218</x>
+    <y>310</y>
     <width>70</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="60" green="180" blue="32">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).ENBL</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #37</name>
+    <name>Label</name>
     <text>Disabled</text>
-    <x>175</x>
-    <y>212</y>
+    <x>213</x>
+    <y>310</y>
     <width>80</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="253" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).ENBL</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #41</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).ENBL</pv_name>
-    <x>155</x>
-    <y>234</y>
+    <x>193</x>
+    <y>332</y>
     <width>120</width>
     <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #44</name>
-    <x>6</x>
-    <y>210</y>
-    <width>430</width>
-    <height>49</height>
-    <line_width>1</line_width>
-    <line_color>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #47</name>
+    <name>Label</name>
     <text>traceError</text>
-    <x>68</x>
-    <y>316</y>
+    <x>87</x>
+    <y>457</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #50</name>
+    <name>Label</name>
     <text>traceIODriver</text>
-    <x>68</x>
-    <y>385</y>
+    <x>87</x>
+    <y>526</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #53</name>
+    <name>Label</name>
     <text>traceIOFilter</text>
-    <x>68</x>
-    <y>362</y>
+    <x>87</x>
+    <y>503</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #56</name>
+    <name>Label</name>
     <text>traceIODevice</text>
-    <x>68</x>
-    <y>339</y>
+    <x>87</x>
+    <y>480</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #59</name>
+    <name>Label</name>
     <text>traceMask</text>
-    <x>9</x>
-    <y>269</y>
+    <x>33</x>
+    <y>405</y>
     <width>90</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #62</name>
+    <name>Label</name>
     <text>traceIOHex</text>
-    <x>242</x>
-    <y>362</y>
+    <x>257</x>
+    <y>504</y>
     <width>80</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #65</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB0</pv_name>
-    <x>9</x>
-    <y>316</y>
+    <x>31</x>
+    <y>457</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #68</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB3</pv_name>
-    <x>9</x>
-    <y>385</y>
+    <x>31</x>
+    <y>526</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #71</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB2</pv_name>
-    <x>9</x>
-    <y>362</y>
+    <x>31</x>
+    <y>503</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #74</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB1</pv_name>
-    <x>9</x>
-    <y>339</y>
+    <x>31</x>
+    <y>480</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #77</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TIB2</pv_name>
-    <x>183</x>
-    <y>362</y>
+    <x>198</x>
+    <y>504</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #80</name>
+    <name>Label</name>
     <text>Truncate size</text>
-    <x>242</x>
-    <y>385</y>
+    <x>257</x>
+    <y>527</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #83</name>
-    <pv_name>$(P)$(R).TSIZ</pv_name>
-    <x>183</x>
-    <y>385</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #87</name>
-    <x>5</x>
-    <y>267</y>
-    <width>430</width>
-    <height>315</height>
-    <line_width>1</line_width>
-    <line_color>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #90</name>
-    <pv_name>$(P)$(R).TMSK</pv_name>
-    <x>9</x>
-    <y>293</y>
-    <width>70</width>
+    <name>Text Input</name>
+    <pv_name>$(P)$(R).TSIZ</pv_name>
+    <x>198</x>
+    <y>529</y>
+    <width>50</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>4</format>
+    <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #94</name>
+    <name>Label</name>
     <text>drvInfo:</text>
-    <x>6</x>
-    <y>97</y>
+    <x>50</x>
+    <y>131</y>
     <width>80</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #97</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).DRVINFO</pv_name>
-    <x>88</x>
-    <y>97</y>
-    <width>150</width>
+    <x>145</x>
+    <y>131</y>
+    <width>133</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #101</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IFACE</pv_name>
-    <x>111</x>
-    <y>122</y>
+    <x>145</x>
+    <y>155</y>
     <width>130</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #104</name>
+    <name>Label</name>
     <text>Interface:</text>
-    <x>6</x>
-    <y>122</y>
+    <x>30</x>
+    <y>155</y>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #107</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R).AQR</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R).AQR</pv_name>
     <text>Cancel queueRequest</text>
-    <x>6</x>
-    <y>147</y>
-    <width>150</width>
+    <x>78</x>
+    <y>190</y>
+    <width>200</width>
     <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #110</name>
+    <name>Label</name>
     <text>Reason:</text>
-    <x>244</x>
-    <y>97</y>
+    <x>279</x>
+    <y>130</y>
     <width>70</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #113</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).REASON</pv_name>
-    <x>318</x>
-    <y>97</y>
-    <width>50</width>
+    <x>364</x>
+    <y>130</y>
+    <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #117</name>
+    <name>Label</name>
     <text>Connected</text>
-    <x>25</x>
-    <y>212</y>
+    <x>63</x>
+    <y>310</y>
     <width>90</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="60" green="180" blue="32">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).CNCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #121</name>
+    <name>Label</name>
     <text>Disconnected</text>
-    <x>10</x>
-    <y>212</y>
+    <x>48</x>
+    <y>310</y>
     <width>120</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="253" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).CNCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #125</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).CNCT</pv_name>
-    <x>10</x>
-    <y>234</y>
+    <x>48</x>
+    <y>332</y>
     <width>120</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #128</name>
+    <name>Label</name>
     <text>Port:</text>
-    <x>6</x>
-    <y>47</y>
+    <x>81</x>
+    <y>80</y>
     <width>50</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #131</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).PORT</pv_name>
-    <x>61</x>
-    <y>47</y>
-    <width>150</width>
+    <x>145</x>
+    <y>80</y>
+    <width>132</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #135</name>
+    <name>Label</name>
     <text>Address:</text>
-    <x>228</x>
-    <y>47</y>
+    <x>271</x>
+    <y>80</y>
     <width>80</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #138</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).ADDR</pv_name>
-    <x>318</x>
-    <y>47</y>
+    <x>364</x>
+    <y>80</y>
     <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #142</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).PCNCT</pv_name>
-    <x>61</x>
-    <y>72</y>
-    <width>120</width>
+    <x>145</x>
+    <y>105</y>
+    <width>132</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #145</name>
+    <name>Label</name>
     <text>Connected</text>
-    <x>243</x>
-    <y>72</y>
+    <x>383</x>
+    <y>105</y>
     <width>90</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="60" green="180" blue="32">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).PCNCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #149</name>
+    <name>Label</name>
     <text>Disconnected</text>
-    <x>228</x>
-    <y>72</y>
+    <x>361</x>
+    <y>105</y>
     <width>120</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="253" green="0" blue="0">
       </color>
     </foreground_color>
-    <horizontal_alignment>2</horizontal_alignment>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).PCNCT</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #153</name>
-    <text>More...</text>
-    <x>291</x>
-    <y>147</y>
+    <name>Label</name>
+    <text>More:</text>
+    <x>320</x>
+    <y>190</y>
     <width>70</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #156</name>
+    <name>Menu Button</name>
     <actions>
       <action type="open_display">
         <file>asynOctet.opi</file>
@@ -779,345 +1359,532 @@
         <description>GPIB parameters</description>
       </action>
     </actions>
-    <text></text>
-    <x>366</x>
-    <y>147</y>
-    <width>56</width>
+    <text>Menu Button Label</text>
+    <x>364</x>
+    <y>190</y>
+    <width>104</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #163</name>
+    <name>Label</name>
     <text>traceIOMask</text>
-    <x>183</x>
-    <y>269</y>
+    <x>198</x>
+    <y>403</y>
     <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #166</name>
+    <name>Label</name>
     <text>traceIOASCII</text>
-    <x>242</x>
-    <y>316</y>
+    <x>257</x>
+    <y>458</y>
     <width>96</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #169</name>
+    <name>Label</name>
     <text>traceIOEscape</text>
-    <x>242</x>
-    <y>339</y>
+    <x>257</x>
+    <y>481</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #172</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TIB0</pv_name>
-    <x>183</x>
-    <y>316</y>
+    <x>198</x>
+    <y>458</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #175</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TIB1</pv_name>
-    <x>183</x>
-    <y>339</y>
+    <x>198</x>
+    <y>481</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #178</name>
-    <pv_name>$(P)$(R).TIOM</pv_name>
-    <x>183</x>
-    <y>293</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>4</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
   <widget type="label" version="2.0.0">
-    <name>text #182</name>
+    <name>Label</name>
     <text>traceInfoMask</text>
-    <x>183</x>
-    <y>415</y>
+    <x>380</x>
+    <y>403</y>
     <width>130</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #185</name>
-    <pv_name>$(P)$(R).TINM</pv_name>
-    <x>183</x>
-    <y>439</y>
-    <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </background_color>
-    <format>4</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #189</name>
-    <text>Trace file:</text>
-    <x>9</x>
-    <y>557</y>
-    <width>88</width>
-    <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #192</name>
-    <pv_name>$(P)$(R).TFIL</pv_name>
-    <x>99</x>
-    <y>555</y>
-    <width>330</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>6</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #196</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB4</pv_name>
-    <x>9</x>
-    <y>408</y>
+    <x>31</x>
+    <y>549</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #199</name>
+    <name>Label</name>
     <text>traceFlow</text>
-    <x>68</x>
-    <y>408</y>
+    <x>87</x>
+    <y>549</y>
     <width>72</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #202</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TB5</pv_name>
-    <x>9</x>
-    <y>431</y>
+    <x>31</x>
+    <y>572</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #205</name>
+    <name>Label</name>
     <text>traceWarning</text>
-    <x>68</x>
-    <y>431</y>
+    <x>87</x>
+    <y>572</y>
     <width>96</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #208</name>
+    <name>Label</name>
     <text>traceInfoPort</text>
-    <x>242</x>
-    <y>485</y>
+    <x>439</x>
+    <y>481</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #211</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TINB1</pv_name>
-    <x>183</x>
-    <y>485</y>
+    <x>380</x>
+    <y>478</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #214</name>
+    <name>Label</name>
     <text>traceInfoSource</text>
-    <x>242</x>
-    <y>508</y>
+    <x>439</x>
+    <y>504</y>
     <width>120</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #217</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TINB2</pv_name>
-    <x>183</x>
-    <y>508</y>
+    <x>380</x>
+    <y>501</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #220</name>
+    <name>Label</name>
     <text>traceInfoTime</text>
-    <x>242</x>
-    <y>462</y>
+    <x>439</x>
+    <y>458</y>
     <width>104</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #223</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TINB0</pv_name>
-    <x>183</x>
-    <y>462</y>
+    <x>380</x>
+    <y>455</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="choice" version="2.0.0">
-    <name>choice button #226</name>
+    <name>Choice Button</name>
     <pv_name>$(P)$(R).TINB3</pv_name>
-    <x>183</x>
-    <y>531</y>
+    <x>380</x>
+    <y>527</y>
     <width>55</width>
     <height>18</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <selected_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </selected_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
     <items>
-      <item>Item 1</item>
-      <item>Item 2</item>
+      <item>Choice 1</item>
+      <item>Choice 2</item>
+      <item>Choice 3</item>
     </items>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #229</name>
+    <name>Label</name>
     <text>traceInfoThread</text>
-    <x>242</x>
-    <y>531</y>
+    <x>439</x>
+    <y>527</y>
     <width>120</width>
-    <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
+      </font>
+    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>GROUP-TITLE</class>
+    <text>ASYN settings for $(P)$(R)</text>
+    <y>9</y>
+    <width>543</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
       </font>
     </font>
-    <auto_size>true</auto_size>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynRegister.bob b/99-Shared/asyn/asynRegister.bob
index 7c743761df8dd23111bd9f58adfc3ebf74c791c5..ad6a0dfc468d2bf352926007f9d12c36108ecd70 100644
--- a/99-Shared/asyn/asynRegister.bob
+++ b/99-Shared/asyn/asynRegister.bob
@@ -4,823 +4,1306 @@
   <x>344</x>
   <y>142</y>
   <width>510</width>
-  <height>345</height>
+  <height>450</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>510</width>
+    <height>400</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </line_color>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_10</name>
+    <x>12</x>
+    <y>360</y>
+    <width>485</width>
+    <height>80</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_22</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_9</name>
+    <x>12</x>
+    <y>120</y>
+    <width>485</width>
+    <height>220</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).I32OUT</pv_name>
+      <x>132</x>
+      <y>85</y>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Input</name>
+      <pv_name>$(P)$(R).I32OUT</pv_name>
+      <x>132</x>
+      <y>110</y>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>4</format>
+      <show_units>false</show_units>
+      <actions>
+      </actions>
+      <border_alarm_sensitive>false</border_alarm_sensitive>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R).I32INP</pv_name>
+      <x>133</x>
+      <y>135</y>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>1</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update</name>
+      <pv_name>$(P)$(R).I32INP</pv_name>
+      <x>133</x>
+      <y>160</y>
+      <foreground_color>
+        <color red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
+      <background_color>
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
+        </color>
+      </background_color>
+      <format>4</format>
+      <show_units>false</show_units>
+      <vertical_alignment>1</vertical_alignment>
+      <wrap_words>false</wrap_words>
+      <actions>
+      </actions>
+      <border_color>
+        <color red="0" green="128" blue="255">
+        </color>
+      </border_color>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_8</name>
+    <x>12</x>
+    <y>60</y>
+    <width>485</width>
+    <height>40</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>510</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
   <widget type="label" version="2.0.0">
-    <name>text #6</name>
+    <name>Label</name>
     <text>Timeout (sec):</text>
-    <x>6</x>
-    <y>43</y>
+    <x>50</x>
+    <y>70</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #9</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).TMOT</pv_name>
-    <x>151</x>
-    <y>43</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>160</x>
+    <y>70</y>
+    <width>110</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #13</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).TMOD</pv_name>
-    <x>320</x>
-    <y>43</y>
+    <x>379</x>
+    <y>70</y>
     <width>110</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
+    <name>Label</name>
     <text>Transfer:</text>
-    <x>225</x>
-    <y>43</y>
+    <x>280</x>
+    <y>70</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #19</name>
+    <name>Label</name>
     <text>I/O Status:</text>
-    <x>10</x>
-    <y>284</y>
+    <x>28</x>
+    <y>370</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #22</name>
+    <name>Label</name>
     <text>I/O Severity:</text>
-    <x>217</x>
-    <y>284</y>
+    <x>237</x>
+    <y>370</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #25</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).STAT</pv_name>
-    <x>122</x>
-    <y>284</y>
-    <width>85</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>162</x>
+    <y>370</y>
+    <width>110</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #29</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).SEVR</pv_name>
-    <x>349</x>
-    <y>284</y>
-    <width>85</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>374</x>
+    <y>370</y>
+    <width>110</width>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #33</name>
-    <x>6</x>
-    <y>279</y>
-    <width>430</width>
-    <height>25</height>
-    <line_width>1</line_width>
-    <line_color>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>Scan:</text>
+    <x>13</x>
+    <y>410</y>
+    <width>50</width>
+    <foreground_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #36</name>
-    <text>Scan:</text>
-    <x>9</x>
-    <y>310</y>
-    <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #39</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).SCAN</pv_name>
-    <x>64</x>
-    <y>310</y>
+    <x>68</x>
+    <y>410</y>
     <width>110</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #42</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(R).PROC</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(R).PROC</pv_name>
     <text>Process</text>
-    <x>179</x>
-    <y>310</y>
+    <x>183</x>
+    <y>410</y>
     <width>80</width>
     <height>20</height>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #45</name>
-    <y>5</y>
-    <width>510</width>
-    <height>29</height>
-    <line_color>
-      <color red="218" green="218" blue="218">
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>9</y>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
     <width>510</width>
-    <height>21</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <horizontal_alignment>1</horizontal_alignment>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #51</name>
+    <name>Label</name>
     <text>Mask (hex):</text>
-    <x>27</x>
-    <y>251</y>
+    <x>22</x>
+    <y>305</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #54</name>
+    <name>Label</name>
     <text>Input (hex):</text>
-    <x>17</x>
-    <y>226</y>
+    <x>12</x>
+    <y>280</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #57</name>
+    <name>Label</name>
     <text>Input:</text>
-    <x>77</x>
-    <y>201</y>
+    <x>72</x>
+    <y>255</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #60</name>
+    <name>Label</name>
     <text>Output (hex):</text>
-    <x>7</x>
-    <y>176</y>
+    <x>2</x>
+    <y>230</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #63</name>
+    <name>Label</name>
     <text>Output:</text>
-    <x>67</x>
-    <y>151</y>
+    <x>62</x>
+    <y>205</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #66</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IFACE</pv_name>
-    <x>5</x>
-    <y>101</y>
-    <width>130</width>
+    <x>20</x>
+    <y>155</y>
+    <width>110</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #69</name>
+    <name>Label</name>
     <text>Interface:</text>
-    <x>37</x>
-    <y>76</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #72</name>
-    <pv_name>$(P)$(R).I32INP</pv_name>
-    <x>147</x>
-    <y>226</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
-      </color>
-    </background_color>
-    <format>4</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>text update #76</name>
-    <pv_name>$(P)$(R).I32INP</pv_name>
-    <x>147</x>
-    <y>201</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
+    <x>32</x>
+    <y>130</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
       </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #80</name>
-    <pv_name>$(P)$(R).I32OUT</pv_name>
-    <x>147</x>
-    <y>176</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>4</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #84</name>
-    <pv_name>$(P)$(R).I32OUT</pv_name>
-    <x>147</x>
-    <y>151</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <background_color>
-      <color red="115" green="223" blue="255">
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #88</name>
+    <name>Label</name>
     <text>Active</text>
-    <x>167</x>
-    <y>126</y>
+    <x>162</x>
+    <y>180</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==1">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==1)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #92</name>
+    <name>Label</name>
     <text>Inactive</text>
-    <x>157</x>
-    <y>126</y>
+    <x>152</x>
+    <y>180</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="!(pv0==1)">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(!(pv0==1))">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #96</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>152</x>
-    <y>101</y>
+    <x>147</x>
+    <y>155</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).I32IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #100</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>142</x>
-    <y>101</y>
+    <x>137</x>
+    <y>155</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).I32IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #104</name>
+    <name>Label</name>
     <text>Int32</text>
-    <x>172</x>
-    <y>76</y>
+    <x>167</x>
+    <y>130</y>
     <width>50</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #107</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).UI32MASK</pv_name>
-    <x>272</x>
-    <y>251</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>267</x>
+    <y>305</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>4</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #111</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).UI32INP</pv_name>
-    <x>272</x>
-    <y>226</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>267</x>
+    <y>280</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>4</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #115</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).UI32INP</pv_name>
-    <x>272</x>
-    <y>201</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>267</x>
+    <y>255</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #119</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).UI32OUT</pv_name>
-    <x>272</x>
-    <y>176</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>267</x>
+    <y>230</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>4</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #123</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).UI32OUT</pv_name>
-    <x>272</x>
-    <y>151</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>267</x>
+    <y>205</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #127</name>
+    <name>Label</name>
     <text>Active</text>
-    <x>292</x>
-    <y>126</y>
+    <x>287</x>
+    <y>180</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==2">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==2)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #131</name>
+    <name>Label</name>
     <text>Inactive</text>
-    <x>282</x>
-    <y>126</y>
+    <x>276</x>
+    <y>180</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="!(pv0==2)">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(!(pv0==2))">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #135</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>267</x>
-    <y>101</y>
+    <x>262</x>
+    <y>155</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).UI32IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #139</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>277</x>
-    <y>101</y>
+    <x>271</x>
+    <y>155</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).UI32IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #143</name>
+    <name>Label</name>
     <text>UInt32Digital</text>
-    <x>257</x>
-    <y>76</y>
+    <x>271</x>
+    <y>130</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #146</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R).F64INP</pv_name>
-    <x>397</x>
-    <y>201</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>392</x>
+    <y>255</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #150</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).F64OUT</pv_name>
-    <x>397</x>
-    <y>151</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>392</x>
+    <y>205</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #154</name>
+    <name>Label</name>
     <text>Active</text>
-    <x>417</x>
-    <y>126</y>
+    <x>412</x>
+    <y>180</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==3">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==3)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #158</name>
+    <name>Label</name>
     <text>Inactive</text>
-    <x>407</x>
-    <y>126</y>
+    <x>412</x>
+    <y>180</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="!(pv0==3)">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(!(pv0==3))">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).IFACE</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #162</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>392</x>
-    <y>101</y>
+    <x>397</x>
+    <y>155</y>
     <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).F64IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #166</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>402</x>
-    <y>101</y>
+    <x>397</x>
+    <y>155</y>
     <width>90</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).F64IV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #170</name>
+    <name>Label</name>
     <text>Float64</text>
-    <x>412</x>
-    <y>76</y>
+    <x>414</x>
+    <y>130</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #173</name>
+    <name>Label</name>
     <text>More...</text>
-    <x>364</x>
-    <y>310</y>
+    <x>351</x>
+    <y>410</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #176</name>
+    <name>Menu Button</name>
     <actions>
       <action type="open_display">
         <file>asynRecord.opi</file>
@@ -843,14 +1326,19 @@
         <description>GPIB parameters</description>
       </action>
     </actions>
-    <text></text>
-    <x>439</x>
-    <y>310</y>
+    <text>Menu Button Label</text>
+    <x>429</x>
+    <y>410</y>
     <width>56</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/99-Shared/asyn/asynSerialPortSetup.bob b/99-Shared/asyn/asynSerialPortSetup.bob
index b849dc55ec2a2e8d06ddde547636f3ee5c1b08eb..5be8193374b5f00f55ef84e18b7179ad38b17be3 100644
--- a/99-Shared/asyn/asynSerialPortSetup.bob
+++ b/99-Shared/asyn/asynSerialPortSetup.bob
@@ -3,350 +3,635 @@
   <name>asynSerialPortSetup</name>
   <x>228</x>
   <y>79</y>
-  <width>260</width>
-  <height>300</height>
+  <width>280</width>
+  <height>400</height>
   <background_color>
-    <color red="187" green="187" blue="187">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="group" version="2.0.0">
+    <name>BGGrey03_12</name>
+    <x>10</x>
+    <y>60</y>
+    <width>250</width>
+    <height>310</height>
+    <style>3</style>
+    <background_color>
+      <color name="BACKGROUND" red="220" green="225" blue="221">
+      </color>
+    </background_color>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_24</name>
+      <pv_name>$(P)$(R)SamplingFrequencyR</pv_name>
+      <x>403</x>
+      <y>596</y>
+      <width>60</width>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+  </widget>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <y>2</y>
-    <width>260</width>
-    <height>16</height>
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>280</width>
+    <height>350</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>280</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
+    <actions>
+    </actions>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
+    <name>Label</name>
+    <class>TITLE</class>
     <text>$(P)$(R)</text>
-    <y>2</y>
-    <width>260</width>
-    <height>16</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>280</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
-    <horizontal_alignment>1</horizontal_alignment>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #12</name>
+    <name>Label</name>
     <text>Supported</text>
-    <x>148</x>
-    <y>25</y>
+    <x>145</x>
+    <y>79</y>
     <width>90</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="51" green="153" blue="0">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0!=0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OPTIONIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #16</name>
+    <name>Label</name>
     <text>Unsupported</text>
-    <x>138</x>
-    <y>25</y>
+    <x>145</x>
+    <y>79</y>
     <width>110</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
     <foreground_color>
       <color red="222" green="19" blue="9">
       </color>
     </foreground_color>
-    <auto_size>true</auto_size>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
         <exp bool_exp="!(pv0==0)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(R).OPTIONIV</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #20</name>
+    <name>Label</name>
     <text>asynOption:</text>
-    <x>8</x>
-    <y>25</y>
+    <x>20</x>
+    <y>79</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <auto_size>true</auto_size>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #23</name>
+    <name>Label</name>
     <text>Baud rate:</text>
-    <x>43</x>
-    <y>51</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>40</x>
+    <y>105</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #26</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).BAUD</pv_name>
-    <x>150</x>
-    <y>51</y>
+    <x>147</x>
+    <y>105</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
+    <name>Label</name>
     <text>Baud rate:</text>
-    <x>43</x>
-    <y>76</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>40</x>
+    <y>130</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #32</name>
+    <name>Label</name>
     <text>Data bits:</text>
-    <x>43</x>
-    <y>101</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>40</x>
+    <y>155</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #35</name>
+    <name>Label</name>
     <text>Stop bits:</text>
-    <x>43</x>
-    <y>126</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>40</x>
+    <y>180</y>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #38</name>
+    <name>Label</name>
     <text>Modem control:</text>
-    <x>3</x>
-    <y>176</y>
+    <y>230</y>
     <width>140</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #41</name>
+    <name>Label</name>
     <text>Parity:</text>
-    <x>73</x>
-    <y>151</y>
+    <x>70</x>
+    <y>205</y>
     <width>70</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #44</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).DBIT</pv_name>
-    <x>150</x>
-    <y>101</y>
+    <x>147</x>
+    <y>155</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #47</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).SBIT</pv_name>
-    <x>150</x>
-    <y>126</y>
+    <x>147</x>
+    <y>180</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #50</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).PRTY</pv_name>
-    <x>150</x>
-    <y>151</y>
+    <x>147</x>
+    <y>205</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #53</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).MCTL</pv_name>
-    <x>150</x>
-    <y>176</y>
+    <x>147</x>
+    <y>230</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #56</name>
+    <name>Label</name>
     <text>Flow control:</text>
-    <x>13</x>
-    <y>201</y>
+    <x>10</x>
+    <y>255</y>
     <width>130</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #59</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).FCTL</pv_name>
-    <x>150</x>
-    <y>201</y>
+    <x>147</x>
+    <y>255</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #62</name>
+    <name>Label</name>
     <text>XOFF output:</text>
-    <x>23</x>
-    <y>226</y>
+    <x>20</x>
+    <y>280</y>
     <width>120</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #65</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXON</pv_name>
-    <x>150</x>
-    <y>226</y>
+    <x>147</x>
+    <y>280</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #68</name>
+    <name>Label</name>
     <text>XOFF input:</text>
-    <x>33</x>
-    <y>251</y>
+    <x>30</x>
+    <y>305</y>
     <width>110</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #71</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXOFF</pv_name>
-    <x>150</x>
-    <y>251</y>
+    <x>147</x>
+    <y>305</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #74</name>
+    <name>Label</name>
     <text>XON=any:</text>
-    <x>63</x>
-    <y>276</y>
+    <x>60</x>
+    <y>330</y>
     <width>80</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #77</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(R).IXANY</pv_name>
-    <x>150</x>
-    <y>276</y>
+    <x>147</x>
+    <y>330</y>
     <width>102</width>
     <height>20</height>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #80</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R).LBAUD</pv_name>
-    <x>150</x>
-    <y>76</y>
+    <x>147</x>
+    <y>130</y>
     <width>102</width>
     <height>18</height>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Sans" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/calc/sseqElement_bare.bob b/99-Shared/calc/sseqElement_bare.bob
index 9bf0578b16121bcee376bf6ef71a6c852349acbc..139e3c2561da19697e3951ea824596b751c7695e 100644
--- a/99-Shared/calc/sseqElement_bare.bob
+++ b/99-Shared/calc/sseqElement_bare.bob
@@ -6,218 +6,302 @@
   <width>750</width>
   <height>32</height>
   <background_color>
-    <color red="200" green="200" blue="200">
+    <color name="Gray_3" red="200" green="200" blue="200">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>671</x>
+    <y>7</y>
+    <width>8</width>
+    <height>8</height>
+    <line_width>0</line_width>
+    <line_color>
+      <color red="128" green="0" blue="255">
+      </color>
+    </line_color>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0!=0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).WTG$(EL)</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>23</x>
+    <width>154</width>
+    <height>24</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="alarm" red="253" green="0" blue="0">
+      </color>
+    </line_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0==0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).DOL$(EL)V</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>518</x>
+    <width>154</width>
+    <height>24</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="alarm" red="253" green="0" blue="0">
+      </color>
+    </line_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0==0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0==0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).LNK$(EL)V</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <x>678</x>
+    <width>69</width>
+    <height>24</height>
+    <line_width>2</line_width>
+    <line_color>
+      <color name="alarm" red="253" green="0" blue="0">
+      </color>
+    </line_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0!=0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).WERR$(EL)</pv_name>
+      </rule>
+    </rules>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+  </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #6</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).DOL$(EL)</pv_name>
     <x>25</x>
     <y>2</y>
     <width>150</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="164" green="170" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #10</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).STR$(EL)</pv_name>
     <x>232</x>
     <y>2</y>
     <width>196</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #14</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).DO$(EL)</pv_name>
     <x>435</x>
     <y>2</y>
     <width>80</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #18</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).LNK$(EL)</pv_name>
     <x>520</x>
     <y>2</y>
     <width>150</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="164" green="170" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #22</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).DLY$(EL)</pv_name>
     <x>180</x>
     <y>2</y>
     <width>45</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #26</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(S).WAIT$(EL)</pv_name>
     <x>680</x>
     <y>2</y>
     <width>65</width>
     <height>20</height>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
+    <name>Label</name>
     <text>$(ELN)</text>
     <y>5</y>
     <width>20</width>
     <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
+      <font family="Cantarell" style="REGULAR" size="10.891089108910892">
       </font>
     </font>
-    <auto_size>true</auto_size>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #32</name>
-    <x>671</x>
-    <y>7</y>
-    <width>8</width>
-    <height>8</height>
-    <line_color>
-      <color red="0" green="216" blue="0">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="0" green="216" blue="0">
-      </color>
-    </background_color>
-    <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(pv0!=0)">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(S).WTG$(EL)</pv_name>
-      </rule>
-    </rules>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #36</name>
-    <x>23</x>
-    <width>154</width>
-    <height>24</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color red="253" green="0" blue="0">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="253" green="0" blue="0">
-      </color>
-    </background_color>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(pv0==0)">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(S).DOL$(EL)V</pv_name>
-      </rule>
-    </rules>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #40</name>
-    <x>518</x>
-    <width>154</width>
-    <height>24</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color red="253" green="0" blue="0">
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="253" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="vis_if_zero" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(pv0==0)">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(S).LNK$(EL)V</pv_name>
-      </rule>
-    </rules>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #44</name>
-    <x>678</x>
-    <width>69</width>
-    <height>24</height>
-    <line_width>2</line_width>
-    <line_color>
-      <color red="253" green="0" blue="0">
-      </color>
-    </line_color>
-    <background_color>
-      <color red="253" green="0" blue="0">
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </background_color>
-    <transparent>true</transparent>
-    <rules>
-      <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(pv0!=0)">
-          <value>false</value>
-        </exp>
-        <pv_name>$(P)$(S).WERR$(EL)</pv_name>
-      </rule>
-    </rules>
+    </border_color>
   </widget>
 </display>
diff --git a/99-Shared/calc/yySseq_full.bob b/99-Shared/calc/yySseq_full.bob
index a2ceddcbb99c201883c73d28806d07b657d8178f..d78e461300799e2ecbca550dee130bfe95f80ba6 100644
--- a/99-Shared/calc/yySseq_full.bob
+++ b/99-Shared/calc/yySseq_full.bob
@@ -3,138 +3,317 @@
   <name>yySseq_full</name>
   <x>33</x>
   <y>25</y>
-  <width>750</width>
-  <height>375</height>
   <background_color>
-    <color red="200" green="200" blue="200">
+    <color red="240" green="240" blue="240">
     </color>
   </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <width>750</width>
-    <height>26</height>
+    <name>BGGrey02-background</name>
+    <y>50</y>
+    <width>800</width>
+    <height>550</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="236" green="236" blue="236">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="236" green="236" blue="236">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>695</x>
+    <y>127</y>
+    <width>70</width>
+    <height>20</height>
+    <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="200" green="200" blue="200">
       </color>
     </background_color>
+    <transparent>true</transparent>
+    <actions>
+    </actions>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>1</EL>
+      <ELN>01</ELN>
+    </macros>
+    <x>20</x>
+    <y>147</y>
+    <width>783</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>2</EL>
+      <ELN>02</ELN>
+    </macros>
+    <x>20</x>
+    <y>172</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>3</EL>
+      <ELN>03</ELN>
+    </macros>
+    <x>20</x>
+    <y>197</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>4</EL>
+      <ELN>04</ELN>
+    </macros>
+    <x>20</x>
+    <y>222</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>5</EL>
+      <ELN>05</ELN>
+    </macros>
+    <x>20</x>
+    <y>247</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>6</EL>
+      <ELN>06</ELN>
+    </macros>
+    <x>20</x>
+    <y>272</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>7</EL>
+      <ELN>07</ELN>
+    </macros>
+    <x>20</x>
+    <y>297</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>8</EL>
+      <ELN>08</ELN>
+    </macros>
+    <x>20</x>
+    <y>322</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>9</EL>
+      <ELN>09</ELN>
+    </macros>
+    <x>20</x>
+    <y>347</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Linking Container</name>
+    <file>sseqElement_bare.opi</file>
+    <macros>
+      <EL>A</EL>
+      <ELN>10</ELN>
+    </macros>
+    <x>20</x>
+    <y>372</y>
+    <width>747</width>
+    <height>25</height>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="combo" version="2.0.0">
-    <name>menu #9</name>
+    <name>Menu Button</name>
     <pv_name>$(P)$(S).SCAN</pv_name>
-    <y>30</y>
+    <x>20</x>
+    <y>60</y>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>message button #12</name>
+    <name>Action Button</name>
     <actions>
       <action type="write_pv">
         <pv_name>$(P)$(S).PROC</pv_name>
         <value>1</value>
-        <description>Write</description>
       </action>
     </actions>
     <pv_name>$(P)$(S).PROC</pv_name>
     <text>PROC</text>
-    <x>180</x>
-    <y>30</y>
+    <x>175</x>
+    <y>60</y>
     <width>40</width>
     <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #15</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).PREC</pv_name>
-    <x>280</x>
-    <y>30</y>
-    <width>25</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <x>335</x>
+    <y>60</y>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #19</name>
-    <text># DIGITS</text>
-    <x>230</x>
-    <y>35</y>
-    <width>50</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>polyline #22</name>
-    <x>-1</x>
-    <y>27</y>
-    <width>749</width>
-    <height>3</height>
-    <line_color>
-      <color red="10" green="0" blue="184">
+    <border_color>
+      <color red="0" green="128" blue="255">
       </color>
-    </line_color>
-    <points>
-      <point x="0.0" y="1.0">
-      </point>
-      <point x="746.0" y="1.0">
-      </point>
-    </points>
+    </border_color>
   </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>text entry #26</name>
-    <pv_name>$(P)$(S).DESC</pv_name>
-    <width>240</width>
-    <height>26</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text># DIGITS:</text>
+    <x>250</x>
+    <y>60</y>
+    <width>70</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
+      <color name="Gray_14" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="236" green="236" blue="236">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <format>1</format>
-    <show_units>false</show_units>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #30</name>
-    <text>($(P)$(S))</text>
-    <x>240</x>
-    <y>6</y>
-    <width>140</width>
-    <height>14</height>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #33</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>yySseq.opi</file>
@@ -143,21 +322,22 @@
       </action>
     </actions>
     <text>Less</text>
-    <x>700</x>
-    <y>320</y>
+    <x>709</x>
+    <y>402</y>
     <width>50</width>
     <height>20</height>
     <foreground_color>
-      <color red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="51" green="153" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #36</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>inlinkHelp.opi</file>
@@ -166,73 +346,118 @@
       </action>
     </actions>
     <text>LINK HELP</text>
-    <x>115</x>
-    <y>50</y>
+    <x>80</x>
+    <y>100</y>
     <width>60</width>
-    <height>16</height>
+    <height>20</height>
     <foreground_color>
-      <color red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="51" green="153" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #39</name>
+    <name>Label</name>
     <text>INPUT PV NAME</text>
-    <x>25</x>
-    <y>55</y>
-    <width>90</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <x>51</x>
+    <y>121</y>
+    <width>130</width>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #42</name>
+    <name>Label</name>
     <text>STRING VALUE</text>
-    <x>230</x>
-    <y>55</y>
-    <width>200</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <x>260</x>
+    <y>121</y>
+    <width>194</width>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
+    <name>Label</name>
     <text>VALUE</text>
-    <x>435</x>
-    <y>55</y>
+    <x>454</x>
+    <y>121</y>
     <width>80</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #48</name>
+    <name>Label</name>
     <text>OUTPUT PV NAME</text>
-    <x>520</x>
-    <y>55</y>
+    <x>568</x>
+    <y>120</y>
     <width>90</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #51</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>outlinkHelp.opi</file>
@@ -241,97 +466,94 @@
       </action>
     </actions>
     <text>LINK HELP</text>
-    <x>610</x>
-    <y>50</y>
+    <x>580</x>
+    <y>100</y>
     <width>60</width>
-    <height>16</height>
+    <height>20</height>
     <foreground_color>
-      <color red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="51" green="153" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #54</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).FLNK</pv_name>
-    <x>520</x>
-    <y>317</y>
+    <x>540</x>
+    <y>399</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="164" green="170" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #58</name>
+    <name>Label</name>
     <text>FORWARD LINK</text>
-    <x>439</x>
-    <y>322</y>
+    <x>459</x>
+    <y>399</y>
     <width>80</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #61</name>
+    <name>Label</name>
     <text>DELAY</text>
-    <x>180</x>
-    <y>55</y>
+    <x>200</x>
+    <y>121</y>
     <width>45</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #64</name>
-    <x>675</x>
-    <y>45</y>
-    <width>70</width>
-    <height>20</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>text #67</name>
-      <text>WAIT FOR</text>
-      <width>70</width>
-      <height>10</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="10.0">
-        </font>
-      </font>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>text #70</name>
-      <text>COMPLETION?</text>
-      <y>10</y>
-      <width>70</width>
-      <height>10</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="10.0">
-        </font>
-      </font>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #73</name>
+    <name>Action Button</name>
     <actions>
       <action type="open_display">
         <file>yySseq_help.opi</file>
@@ -340,241 +562,69 @@
       </action>
     </actions>
     <text>?</text>
-    <x>675</x>
-    <y>313</y>
+    <x>720</x>
+    <y>427</y>
     <width>25</width>
     <height>27</height>
     <foreground_color>
-      <color red="255" green="255" blue="255">
+      <color name="BLACK" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <background_color>
-      <color red="51" green="153" blue="0">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
+    <tooltip>$(actions)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #76</name>
+    <name>Label</name>
     <text>NUMERIC</text>
-    <x>434</x>
-    <y>45</y>
+    <x>454</x>
+    <y>100</y>
     <width>80</width>
-    <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #79</name>
-    <x>290</x>
-    <y>315</y>
-    <width>100</width>
-    <height>25</height>
-    <style>3</style>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>text #82</name>
-      <text>BUSY</text>
-      <x>50</x>
-      <width>50</width>
-      <height>10</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="10.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color red="26" green="115" blue="9">
-        </color>
-      </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <rules>
-        <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
-          <exp bool_exp="!(pv0!=0)">
-            <value>false</value>
-          </exp>
-          <pv_name>$(P)$(S).BUSY</pv_name>
-        </rule>
-      </rules>
-    </widget>
-    <widget type="group" version="2.0.0">
-      <name>composite #86</name>
-      <y>5</y>
-      <width>100</width>
-      <height>20</height>
-      <style>3</style>
-      <transparent>true</transparent>
-      <widget type="action_button" version="3.0.0">
-        <name>message button #89</name>
-        <actions>
-          <action type="write_pv">
-            <pv_name>$(P)$(S).ABORT</pv_name>
-            <value>1</value>
-            <description>Write</description>
-          </action>
-        </actions>
-        <pv_name>$(P)$(S).ABORT</pv_name>
-        <text>ABORT</text>
-        <width>45</width>
-        <height>20</height>
-        <background_color>
-          <color red="115" green="223" blue="255">
-          </color>
-        </background_color>
-      </widget>
-      <widget type="label" version="2.0.0">
-        <name>text #92</name>
-        <text>ABORTING</text>
-        <x>50</x>
-        <y>5</y>
-        <width>50</width>
-        <height>10</height>
-        <font>
-          <font family="Liberation Sans" style="REGULAR" size="10.0">
-          </font>
-        </font>
-        <foreground_color>
-          <color red="253" green="0" blue="0">
-          </color>
-        </foreground_color>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules>
-          <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
-            <exp bool_exp="!(pv0!=0)">
-              <value>false</value>
-            </exp>
-            <pv_name>$(P)$(S).ABORT</pv_name>
-          </rule>
-        </rules>
-      </widget>
-    </widget>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #96</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>1</EL>
-      <ELN>01</ELN>
-    </macros>
-    <y>65</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #98</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>2</EL>
-      <ELN>02</ELN>
-    </macros>
-    <y>90</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #100</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>3</EL>
-      <ELN>03</ELN>
-    </macros>
-    <y>115</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #102</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>4</EL>
-      <ELN>04</ELN>
-    </macros>
-    <y>140</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #104</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>5</EL>
-      <ELN>05</ELN>
-    </macros>
-    <y>165</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #106</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>6</EL>
-      <ELN>06</ELN>
-    </macros>
-    <y>190</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #108</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>7</EL>
-      <ELN>07</ELN>
-    </macros>
-    <y>215</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #110</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>8</EL>
-      <ELN>08</ELN>
-    </macros>
-    <y>240</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #112</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>9</EL>
-      <ELN>09</ELN>
-    </macros>
-    <y>265</y>
-    <width>747</width>
-    <height>25</height>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>composite #114</name>
-    <file>sseqElement_bare.bob</file>
-    <macros>
-      <EL>A</EL>
-      <ELN>10</ELN>
-    </macros>
-    <y>290</y>
-    <width>747</width>
-    <height>25</height>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #116</name>
+    <name>Label</name>
     <text>WAIT requires CA link</text>
-    <x>25</x>
-    <y>320</y>
-    <width>140</width>
-    <height>14</height>
+    <x>30</x>
+    <y>461</y>
+    <width>153</width>
     <foreground_color>
-      <color red="253" green="0" blue="0">
+      <color name="alarm" red="253" green="0" blue="0">
       </color>
     </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(a||b||c||d)">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0||pv1||pv2||">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0||pv1||pv2||)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(S).WERR1</pv_name>
@@ -583,22 +633,36 @@
         <pv_name>$(P)$(S).WERR4</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #120</name>
+    <name>Label</name>
     <text>WAIT requires CA link</text>
-    <x>25</x>
-    <y>320</y>
-    <width>140</width>
-    <height>14</height>
+    <x>30</x>
+    <y>416</y>
+    <width>153</width>
     <foreground_color>
-      <color red="253" green="0" blue="0">
+      <color name="alarm" red="253" green="0" blue="0">
       </color>
     </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(a||b||c||d)">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0||pv1||pv2||">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0||pv1||pv2||)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(S).WERR5</pv_name>
@@ -607,121 +671,379 @@
         <pv_name>$(P)$(S).WERR8</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #124</name>
+    <name>Label</name>
     <text>WAIT requires CA link</text>
-    <x>25</x>
-    <y>320</y>
-    <width>140</width>
-    <height>14</height>
+    <x>26</x>
+    <y>438</y>
+    <width>160</width>
     <foreground_color>
-      <color red="253" green="0" blue="0">
+      <color name="alarm" red="253" green="0" blue="0">
       </color>
     </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
     <rules>
-      <rule name="vis_calc" prop_id="visible" out_exp="false">
-        <exp bool_exp="!(a||b)">
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0||">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0||)">
           <value>false</value>
         </exp>
         <pv_name>$(P)$(S).WERR9</pv_name>
         <pv_name>$(P)$(S).WERRA</pv_name>
       </rule>
     </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #128</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).SELL</pv_name>
-    <x>5</x>
-    <y>350</y>
+    <x>25</x>
+    <y>540</y>
     <width>150</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="164" green="170" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #132</name>
+    <name>Label</name>
     <text>SELL</text>
-    <x>5</x>
-    <y>340</y>
+    <x>25</x>
+    <y>510</y>
     <width>150</width>
     <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #135</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(S).SELN</pv_name>
-    <x>160</x>
-    <y>350</y>
+    <x>180</x>
+    <y>540</y>
     <width>45</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>1</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #139</name>
+    <name>Label</name>
     <text>SELN</text>
-    <x>160</x>
-    <y>340</y>
+    <x>180</x>
+    <y>510</y>
     <width>45</width>
     <height>10</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="10.0">
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_1</name>
+    <class>TITLE</class>
+    <text>$(P)$(S).DESC</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>800</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
       </font>
     </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>WAIT FOR</text>
+    <x>695</x>
+    <y>100</y>
+    <width>70</width>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
-  <widget type="group" version="2.0.0">
-    <name>composite #142</name>
-    <x>210</x>
-    <y>340</y>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>COMPLETION?</text>
+    <x>680</x>
+    <y>120</y>
+    <width>103</width>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="combo" version="2.0.0">
+    <name>Menu Button</name>
+    <pv_name>$(P)$(S).SELM</pv_name>
+    <x>230</x>
+    <y>540</y>
+    <width>80</width>
+    <height>20</height>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>SELM</text>
+    <x>230</x>
+    <y>510</y>
     <width>80</width>
-    <height>30</height>
+    <height>10</height>
+    <foreground_color>
+      <color name="Gray_14" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>Grouping Container</name>
+    <x>310</x>
+    <y>407</y>
+    <width>70</width>
+    <height>20</height>
     <style>3</style>
+    <foreground_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="200" green="200" blue="200">
+      </color>
+    </background_color>
     <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>text #145</name>
-      <text>SELM</text>
-      <width>80</width>
-      <height>10</height>
-      <font>
-        <font family="Liberation Sans" style="REGULAR" size="10.0">
-        </font>
-      </font>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-    <widget type="combo" version="2.0.0">
-      <name>menu #148</name>
-      <pv_name>$(P)$(S).SELM</pv_name>
-      <y>10</y>
-      <width>80</width>
+    <actions>
+    </actions>
+    <widget type="action_button" version="3.0.0">
+      <name>Action Button</name>
+      <actions>
+        <action type="write_pv">
+          <pv_name>$(P)$(S).ABORT</pv_name>
+          <value>1</value>
+        </action>
+      </actions>
+      <pv_name>$(P)$(S).ABORT</pv_name>
+      <text>ABORT</text>
+      <width>70</width>
       <height>20</height>
+      <foreground_color>
+        <color name="BLACK" red="0" green="0" blue="0">
+        </color>
+      </foreground_color>
       <background_color>
-        <color red="115" green="223" blue="255">
+        <color name="BLACK-TEXT" red="255" green="255" blue="255">
         </color>
       </background_color>
-      <border_alarm_sensitive>false</border_alarm_sensitive>
     </widget>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>ABORTING</text>
+    <x>300</x>
+    <y>437</y>
+    <width>50</width>
+    <foreground_color>
+      <color name="alarm" red="253" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0!=0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).ABORT</pv_name>
+      </rule>
+    </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label</name>
+    <text>BUSY</text>
+    <x>355</x>
+    <y>437</y>
+    <width>50</width>
+    <foreground_color>
+      <color name="MEDM_COLOR_64" red="26" green="115" blue="9">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="Visibility" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0!=0">
+          <value>true</value>
+        </exp>
+        <exp bool_exp="!(pv0!=0)">
+          <value>false</value>
+        </exp>
+        <pv_name>$(P)$(S).BUSY</pv_name>
+      </rule>
+    </rules>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
 </display>