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>