diff --git a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob
index 2d7a26474207853f93123b8ca14ce38a897f1a3f..9231c1e6915417310b6af8738d294b48f5cbeb5e 100644
--- a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob
+++ b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_CAV.bob
@@ -1,29 +1,361 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<display version='2.0.0'>
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
   <name>em_syn_CAV</name>
   <class></class>
-  <width>530</width>
+  <width>570</width>
   <height>200</height>
   <background_color>
-    <color name='Transparent' red='255' green='255' blue='255' alpha='0'>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
-  <widget type='label' version='2.0.0'>
-    <name>Label</name>
-    <text>em_syn_CAV</text>
-    <x>10</x>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar</name>
+    <width>570</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background</name>
+    <x>280</x>
     <y>10</y>
-    <width>510</width>
+    <width>280</width>
     <height>180</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Text Update_25</name>
+    <actions>
+      <action type="open_display">
+        <file>../../SubWindows/BCM.bob</file>
+        <macros>
+          <PV_label>X2</PV_label>
+          <PV_name>$(X1)</PV_name>
+        </macros>
+        <target>window</target>
+        <description>OpenBCMdetails</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>10</x>
+    <y>160</y>
+    <width>140</width>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <tooltip>not working yet.</tooltip>
+    <enabled>false</enabled>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED Template_12</name>
+    <pv_name>PwrR.SEVR</pv_name>
+    <x>10</x>
+    <y>10</y>
+    <width>140</width>
+    <height>30</height>
+    <off_label>CONNECTION</off_label>
+    <off_color>
+      <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+      </color>
+    </off_color>
+    <on_label>CONNECTION</on_label>
+    <on_color>
+      <color name="LED-RED-ON" red="255" green="60" blue="46">
+      </color>
+    </on_color>
     <font>
-      <font family='Liberation Sans' style='REGULAR' size='24.0'>
+      <font family="Source Sans Pro" style="REGULAR" size="12.0">
       </font>
     </font>
+    <square>true</square>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+":PwrR.SEVR"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>XX</name>
+    <x>10</x>
+    <y>50</y>
+    <width>140</width>
+    <height>100</height>
+    <style>3</style>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_26</name>
+      <x>60</x>
+      <y>10</y>
+      <width>70</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_50</name>
+      <text>State:</text>
+      <x>10</x>
+      <y>10</y>
+      <width>40</width>
+      <horizontal_alignment>2</horizontal_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_51</name>
+      <text>Amp:</text>
+      <x>10</x>
+      <y>40</y>
+      <width>40</width>
+      <horizontal_alignment>2</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_27</name>
+      <x>60</x>
+      <y>40</y>
+      <width>70</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0+"-AvgValue"</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_52</name>
+      <text>Phase:</text>
+      <x>6</x>
+      <y>70</y>
+      <width>44</width>
+      <horizontal_alignment>2</horizontal_alignment>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_28</name>
+      <x>60</x>
+      <y>70</y>
+      <width>70</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0+"-IPCH-RBV"</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+  </widget>
+  <widget type="stripchart" version="2.0.0">
+    <name>X/Y Plot</name>
+    <x>290</x>
+    <y>20</y>
+    <width>260</width>
+    <height>160</height>
+    <background_color>
+      <color name="Button_Background" red="210" green="210" blue="210">
+      </color>
+    </background_color>
+    <show_toolbar>false</show_toolbar>
+    <rules>
+      <rule name="pvnameFwd" prop_id="traces[0].y_pv" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-FwdP"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+      <rule name="pvnameRef" prop_id="traces[1].y_pv" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-RefP"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <time_range>5 minute</time_range>
+    <y_axes>
+      <y_axis>
+        <title>Fwd Power</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <visible>true</visible>
+      </y_axis>
+      <y_axis>
+        <title>Ref Power</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>100.0</maximum>
+        <show_grid>false</show_grid>
+        <visible>true</visible>
+      </y_axis>
+    </y_axes>
+    <traces>
+      <trace>
+        <name>$(traces[0].y_pv)</name>
+        <y_pv></y_pv>
+        <axis>0</axis>
+        <trace_type>2</trace_type>
+        <color>
+          <color red="0" green="0" blue="255">
+          </color>
+        </color>
+        <line_width>2</line_width>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+      <trace>
+        <name>$(traces[1].y_pv)</name>
+        <y_pv></y_pv>
+        <axis>0</axis>
+        <trace_type>2</trace_type>
+        <color>
+          <color red="255" green="0" blue="0">
+          </color>
+        </color>
+        <line_width>2</line_width>
+        <point_type>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_2</name>
+    <x>160</x>
+    <y>10</y>
+    <width>110</width>
+    <height>180</height>
+    <line_width>0</line_width>
     <background_color>
-      <color name='Transparent' red='255' green='255' blue='255' alpha='0'>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="tank" version="2.0.0">
+    <name>Tank_ref</name>
+    <pv_name>$(PV_ref)</pv_name>
+    <x>220</x>
+    <y>20</y>
+    <width>40</width>
+    <height>115</height>
+    <fill_color>
+      <color name="ORANGE-BACKGROUND" red="226" green="207" blue="189">
+      </color>
+    </fill_color>
+    <empty_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </empty_color>
+    <scale_visible>false</scale_visible>
+    <tooltip>Reflected Power - $(pv_value)</tooltip>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>$(PV_refmaxlim)</maximum>
+  </widget>
+  <widget type="tank" version="2.0.0">
+    <name>Tank_fwd</name>
+    <pv_name>$(PV_fwd)</pv_name>
+    <x>170</x>
+    <y>20</y>
+    <width>40</width>
+    <height>115</height>
+    <fill_color>
+      <color name="ORANGE-BACKGROUND" red="226" green="207" blue="189">
+      </color>
+    </fill_color>
+    <empty_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </empty_color>
+    <scale_visible>false</scale_visible>
+    <tooltip>Forward Power - $(pv_value)</tooltip>
+    <limits_from_pv>false</limits_from_pv>
+    <maximum>$(PV_fwdmaxlim)</maximum>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_53</name>
+    <text>Fwd</text>
+    <x>170</x>
+    <y>140</y>
+    <width>40</width>
+    <height>15</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>2</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_54</name>
+    <text>Ref</text>
+    <x>220</x>
+    <y>140</y>
+    <width>40</width>
+    <height>15</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>2</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_31</name>
+    <x>170</x>
+    <y>160</y>
+    <width>40</width>
+    <horizontal_alignment>1</horizontal_alignment>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-AvgValue"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_33</name>
+    <x>220</x>
+    <y>160</y>
+    <width>40</width>
     <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-AvgValue"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob
index 6464d1435753e70c8a329c9f7f8db14c7cf7c6ff..d0b32f3f76334c082574ee67172e4a33929ced3e 100644
--- a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob
+++ b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_FC.bob
@@ -1,29 +1,345 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<display version='2.0.0'>
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
   <name>em_syn_FC</name>
   <class></class>
-  <width>530</width>
+  <width>570</width>
   <height>200</height>
   <background_color>
-    <color name='Transparent' red='255' green='255' blue='255' alpha='0'>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
     </color>
   </background_color>
-  <widget type='label' version='2.0.0'>
-    <name>Label</name>
-    <text>em_syn_FC</text>
-    <x>10</x>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-titlebar_1</name>
+    <width>570</width>
+    <height>200</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+    <corner_width>10</corner_width>
+    <corner_height>10</corner_height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_1</name>
+    <x>170</x>
     <y>10</y>
-    <width>510</width>
+    <width>390</width>
     <height>180</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+      </color>
+    </background_color>
+    <corner_width>5</corner_width>
+    <corner_height>5</corner_height>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Text Update_38</name>
+    <actions>
+      <action type="open_display">
+        <file>../../SubWindows/BCM.bob</file>
+        <macros>
+          <PV_label>X2</PV_label>
+          <PV_name>$(X1)</PV_name>
+        </macros>
+        <target>window</target>
+        <description>OpenBCMdetails</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>10</x>
+    <y>160</y>
+    <width>150</width>
+    <background_color>
+      <color name="Read_Background" red="240" green="240" blue="240">
+      </color>
+    </background_color>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <tooltip>not working yet.</tooltip>
+    <enabled>false</enabled>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED Template_13</name>
+    <pv_name>PwrR.SEVR</pv_name>
+    <x>10</x>
+    <y>10</y>
+    <width>150</width>
+    <height>30</height>
+    <off_label>CONNECTION</off_label>
+    <off_color>
+      <color red="255" green="0" blue="0">
+      </color>
+    </off_color>
+    <on_label>CONNECTION</on_label>
+    <on_color>
+      <color name="OK" red="0" green="255" blue="0">
+      </color>
+    </on_color>
     <font>
-      <font family='Liberation Sans' style='REGULAR' size='24.0'>
+      <font family="Source Sans Pro" style="REGULAR" size="12.0">
       </font>
     </font>
+    <square>true</square>
+    <actions>
+    </actions>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-ControlR"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>XX_1</name>
+    <x>10</x>
+    <y>50</y>
+    <width>150</width>
+    <height>100</height>
+    <style>3</style>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_39</name>
+      <x>80</x>
+      <y>10</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0+"-ControlR"</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_72</name>
+      <text>State:</text>
+      <x>10</x>
+      <y>10</y>
+      <width>60</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_73</name>
+      <text>Pulse-Q:</text>
+      <x>10</x>
+      <y>40</y>
+      <width>60</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Pulse-Charge</tooltip>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>Label_74</name>
+      <text>FT-Q:</text>
+      <x>10</x>
+      <y>70</y>
+      <width>60</width>
+      <horizontal_alignment>2</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <tooltip>Flat-top-charge</tooltip>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_40</name>
+      <x>80</x>
+      <y>40</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0+"-PulseChargeUcR"</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+    <widget type="textupdate" version="2.0.0">
+      <name>Text Update_41</name>
+      <x>80</x>
+      <y>70</y>
+      <width>60</width>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+      <rules>
+        <rule name="pvname" prop_id="pv_name" out_exp="true">
+          <exp bool_exp="pvStr0">
+            <expression>pvStr0+"-FlatTopChargeUcR"</expression>
+          </exp>
+          <pv_name>$(synopticsPV)</pv_name>
+        </rule>
+      </rules>
+    </widget>
+  </widget>
+  <widget type="xyplot" version="2.0.0">
+    <name>X/Y Plot_2</name>
+    <x>180</x>
+    <y>20</y>
+    <width>270</width>
+    <height>160</height>
     <background_color>
-      <color name='Transparent' red='255' green='255' blue='255' alpha='0'>
+      <color name="Transparent" red="255" green="255" blue="255" alpha="0">
       </color>
     </background_color>
+    <grid_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </grid_color>
+    <show_legend>false</show_legend>
+    <rules>
+      <rule name="pvnameYtrace" prop_id="traces[0].y_pv" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-TRC2-ArrayData"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+    <x_axis>
+      <title>ADC 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 family="Liberation Sans" style="BOLD" size="12.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>Current [mA]</title>
+        <autoscale>true</autoscale>
+        <log_scale>false</log_scale>
+        <minimum>0.0</minimum>
+        <maximum>8000.0</maximum>
+        <show_grid>true</show_grid>
+        <title_font>
+          <font family="Liberation Sans" style="BOLD" size="12.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></name>
+        <x_pv></x_pv>
+        <y_pv>$(PV_name)</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>0</point_type>
+        <point_size>10</point_size>
+        <visible>true</visible>
+      </trace>
+    </traces>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_75</name>
+    <text>Av:</text>
+    <x>450</x>
+    <y>40</y>
+    <width>40</width>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <tooltip>Flat-Top Average Current</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_76</name>
+    <text>Max:</text>
+    <x>450</x>
+    <y>70</y>
+    <width>40</width>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <tooltip>Flat-Top Maximum Current</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_77</name>
+    <text>Min:</text>
+    <x>450</x>
+    <y>100</y>
+    <width>40</width>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <tooltip>Flat-Top Minimum Current</tooltip>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_42</name>
+    <x>500</x>
+    <y>40</y>
+    <width>50</width>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-STAT3-MeanValueR"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_43</name>
+    <x>500</x>
+    <y>70</y>
+    <width>50</width>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-STAT3-MaxValueR"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_44</name>
+    <x>500</x>
+    <y>100</y>
+    <width>50</width>
     <horizontal_alignment>1</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
+    <rules>
+      <rule name="pvname" prop_id="pv_name" out_exp="true">
+        <exp bool_exp="pvStr0">
+          <expression>pvStr0+"-STAT3-MinValueR"</expression>
+        </exp>
+        <pv_name>$(synopticsPV)</pv_name>
+      </rule>
+    </rules>
   </widget>
 </display>
diff --git a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob
index 50b731465a096aa6023900500e6c1e7b7e5522f0..8784cde596d5eb5af44d53c3855b806daf8dc228 100644
--- a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob
+++ b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/SynopticDevices/em_syn_LABBCM.bob
@@ -210,7 +210,7 @@
       </rule>
       <rule name="pvnameYtrace" prop_id="traces[0].y_pv" out_exp="true">
         <exp bool_exp="pvStr0">
-          <expression>pvStr0+":PROC1-TR1-Arraydata"</expression>
+          <expression>pvStr0+":PROC1-TR1-ArrayData"</expression>
         </exp>
         <pv_name>$(synopticsPV)</pv_name>
       </rule>
diff --git a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob
index 2d1e63bac2409178d2847891c76e8b1a7b8f0a4e..7c7e9ae2e1b771aa08d2084830b4f8ddd673ae28 100644
--- a/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob
+++ b/NON-APPROVED/COMMON/LINAC-SYNOPTIC/synopticsfiles/linac_synoptics_main.bob
@@ -654,7 +654,7 @@
           <exp bool_exp="pvStr0=='BPM'">
             <value>SynopticDevices/em_syn_BPM.bob</value>
           </exp>
-          <exp bool_exp="pvStr0=='Cav'">
+          <exp bool_exp="pvStr0=='Cav' or pvStr0=='CavS' or pvStr0=='CavM' or pvStr0=='CavH'">
             <value>SynopticDevices/em_syn_CAV.bob</value>
           </exp>
           <exp bool_exp="pvStr0=='Chop'">
@@ -669,7 +669,7 @@
           <exp bool_exp="pvStr0=='Dump'">
             <value>SynopticDevices/em_syn_DUMP.bob</value>
           </exp>
-          <exp bool_exp="pvStr0=='VVMC'">
+          <exp bool_exp="pvStr0=='EMU'">
             <value>SynopticDevices/em_syn_EMU.bob</value>
           </exp>
           <exp bool_exp="pvStr0=='FC'">
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
index 09fcf2fcaaaa4f08af15c05c4893797b37ec548d..71043f9bc275bcb9e0de091b6f349d489a756b18 100755
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/Navigator.bob
@@ -173,8 +173,8 @@
         <group_name></group_name>
       </tab>
       <tab>
-        <name>Beamlines</name>
-        <file>OverviewScreens/Beamlines/0_Overview.bob</file>
+        <name>NSI</name>
+        <file>OverviewScreens/NSI/0_Overview.bob</file>
         <macros>
         </macros>
         <group_name></group_name>
@@ -249,19 +249,6 @@
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button</name>
-    <actions>
-      <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
-        <macros>
-          <detachwindowpath>collectedOPIs_01_systs_ints_history.bob</detachwindowpath>
-          <windowheight>1342</windowheight>
-          <windowtitle>Interlocks History</windowtitle>
-          <windowwidth>2350</windowwidth>
-        </macros>
-        <target>window</target>
-        <description>Check States</description>
-      </action>
-    </actions>
     <text>Check States</text>
     <x>1960</x>
     <y>10</y>
@@ -280,10 +267,10 @@
     <name>DetachButton</name>
     <actions>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_mainOverview.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/0_Overview.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Main Overview</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -292,10 +279,10 @@
         <description>Detach Main</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_system.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/System/0_Navigator.bob</detachwindowpath>
           <windowheight>1240</windowheight>
           <windowtitle>Main Overview</windowtitle>
           <windowwidth>2380</windowwidth>
@@ -304,10 +291,10 @@
         <description>Detach System</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_diagnostics.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Beam/PBI.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Proton Beam Instrumentation</windowtitle>
           <windowwidth>2400</windowwidth>
@@ -316,22 +303,22 @@
         <description>Detach PBI</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_beamsettings.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Beam/BeamSettings.bob</detachwindowpath>
           <windowheight>800</windowheight>
           <windowtitle>Beam Settings</windowtitle>
           <windowwidth>2440</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach beam Setup</description>
+        <description>Detach Beam Setings</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_magnets.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Magnet/0_Navigator.bob</detachwindowpath>
           <windowheight>1240</windowheight>
           <windowtitle>Magnet Controls Overview</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -340,10 +327,10 @@
         <description>Detach Magnets</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_cavities.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Cavities/0_Navigator.bob</detachwindowpath>
           <windowheight>1240</windowheight>
           <windowtitle>Cavities Overview</windowtitle>
           <windowwidth>2500</windowwidth>
@@ -352,10 +339,10 @@
         <description>Detach RF Systems</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_Target.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/Target/0_Navigator.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Target Overview</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -364,22 +351,22 @@
         <description>Open Detach Target</description>
       </action>
       <action type="open_display">
-        <file>detachwindowcontainer.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_Beamlines.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/NSI/0_Overview.bob</detachwindowpath>
           <windowheight>1300</windowheight>
-          <windowtitle>Beamlines Overview</windowtitle>
+          <windowtitle>Neutron Science Instruments Overview</windowtitle>
           <windowwidth>2350</windowwidth>
         </macros>
         <target>window</target>
-        <description>Detach Beamlines</description>
+        <description>Detach Neutron Science Instruments</description>
       </action>
       <action type="open_display">
-        <file>collectedOPIs_01_teststand2.bob</file>
+        <file>SubScreens/detachwindowcontainer.bob</file>
         <macros>
           <ROOT>$(ROOT)</ROOT>
-          <detachwindowpath>collectedOPIs_01_teststand2.bob</detachwindowpath>
+          <detachwindowpath>../OverviewScreens/TS2/Cryogenics.bob</detachwindowpath>
           <windowheight>1300</windowheight>
           <windowtitle>Test Stand 2 Overview</windowtitle>
           <windowwidth>2350</windowwidth>
@@ -390,7 +377,7 @@
     </actions>
     <text>Detach</text>
     <x>14</x>
-    <y>550</y>
+    <y>600</y>
     <width>117</width>
     <height>40</height>
     <tooltip>$(actions)</tooltip>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beamlines/0_Overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/NSI/0_Overview.bob
similarity index 100%
rename from NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/Beamlines/0_Overview.bob
rename to NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/NSI/0_Overview.bob
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob
index 094d4118ab05824becbddc83ff8c60f67d05d45d..64c10ea42a88964e024c843cd614e3d0e28674ed 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/DigitalMeasure/FS_BlockIcon_Vertical_Left.bob
@@ -3,26 +3,11 @@
   <name>FS_BlockIcon_Vertical_Left</name>
   <width>170</width>
   <height>85</height>
-  <widget type="symbol" version="2.0.0">
-    <name>WID_CenterIcon</name>
-    <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:SwitchFlowON</pv_name>
-    <symbols>
-      <symbol>../../symbols/custom_v02/valve_hand/valve_hand_OFF@64.png</symbol>
-      <symbol>../../symbols/custom_v02/valve_hand/valve_hand_OK@64.png</symbol>
-    </symbols>
-    <y>16</y>
-    <width>64</width>
-    <height>64</height>
-    <rotation>-90.0</rotation>
-    <actions execute_as_one="true">
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
   <widget type="label" version="2.0.0">
     <name>WID_TitleLBL</name>
     <text>${WIDDev}-${WIDIndex}</text>
-    <x>55</x>
-    <y>3</y>
+    <x>52</x>
+    <y>30</y>
     <width>98</width>
     <height>30</height>
     <font>
@@ -184,4 +169,19 @@ PVFactory.releasePV(Inhibit_Lock);
     <transparent>true</transparent>
     <tooltip>Open faceplate</tooltip>
   </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>WID_CenterIcon</name>
+    <pv_name>${WIDSecSub}:${WIDDis}-${WIDDev}-${WIDIndex}:SwitchFlowON</pv_name>
+    <symbols>
+      <symbol>../../symbols/custom_v02/valve_hand/valve_hand_OFF@64.png</symbol>
+      <symbol>../../symbols/custom_v02/valve_hand/valve_hand_OK@64.png</symbol>
+    </symbols>
+    <y>16</y>
+    <width>64</width>
+    <height>64</height>
+    <rotation>-90.0</rotation>
+    <actions execute_as_one="true">
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+  </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
index a10abe0b0d84b9861510d63246c919ef21e7e925..4f5cb65b9084ec31a04390cda3b4f0cecd2d54e4 100644
--- a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
+++ b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
@@ -9,10 +9,32 @@
     <SUBSEC>010CRM</SUBSEC>
   </macros>
   <width>1060</width>
+  <height>620</height>
+  <background_color>
+    <color red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="polyline" version="2.0.0">
+    <name>Pipe 10000_95</name>
+    <x>980</x>
+    <y>255</y>
+    <width>1</width>
+    <height>131</height>
+    <line_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </line_color>
+    <points>
+      <point x="0.0" y="0.0">
+      </point>
+      <point x="0.0" y="131.0">
+      </point>
+    </points>
+  </widget>
   <widget type="group" version="2.0.0">
     <name>CryoGroup</name>
     <x>20</x>
-    <y>100</y>
+    <y>70</y>
     <width>880</width>
     <height>210</height>
     <style>3</style>
@@ -22,8 +44,12 @@
       <x>760</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -32,8 +58,12 @@
       <x>724</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -42,8 +72,12 @@
       <x>570</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -52,8 +86,12 @@
       <x>534</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -62,8 +100,12 @@
       <x>380</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -72,8 +114,12 @@
       <x>344</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -82,8 +128,12 @@
       <x>158</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -92,8 +142,12 @@
       <x>122</x>
       <y>190</y>
       <width>10</width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -103,8 +157,12 @@
       <y>95</y>
       <width>5</width>
       <height>10</height>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
@@ -114,28 +172,15 @@
       <y>95</y>
       <width>5</width>
       <height>10</height>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <background_color>
-        <color name="Background" red="220" green="225" blue="221">
+        <color name="Background" red="255" green="255" blue="255">
         </color>
       </background_color>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>Cryo Module Label</name>
-      <text>Cryo Module</text>
-      <x>40</x>
-      <y>66</y>
-      <width>800</width>
-      <font>
-        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
-        </font>
-      </font>
-      <foreground_color>
-        <color name="WHITE" red="255" green="255" blue="255">
-        </color>
-      </foreground_color>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
-    </widget>
     <widget type="rectangle" version="2.0.0">
       <name>Cryo Module Inner</name>
       <x>42</x>
@@ -143,6 +188,10 @@
       <width>796</width>
       <height>200</height>
       <line_width>1</line_width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <transparent>true</transparent>
       <corner_width>30</corner_width>
       <corner_height>30</corner_height>
@@ -153,6 +202,10 @@
       <width>800</width>
       <height>200</height>
       <line_width>1</line_width>
+      <line_color>
+        <color name="Grid" red="128" green="128" blue="128">
+        </color>
+      </line_color>
       <transparent>true</transparent>
       <corner_width>30</corner_width>
       <corner_height>30</corner_height>
@@ -163,7 +216,7 @@
       <width>880</width>
       <height>1</height>
       <line_color>
-        <color name="WHITE" red="255" green="255" blue="255">
+        <color name="Grid" red="128" green="128" blue="128">
         </color>
       </line_color>
       <points>
@@ -173,32 +226,29 @@
         </point>
       </points>
     </widget>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>TTle</name>
-    <text>            TS2 Cooling Water System</text>
-    <width>1060</width>
-    <height>80</height>
-    <font>
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+    <widget type="label" version="2.0.0">
+      <name>Cryo Module Label</name>
+      <text>Cryo Module</text>
+      <x>40</x>
+      <y>60</y>
+      <width>800</width>
+      <height>35</height>
+      <font>
+        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+        </font>
       </font>
-    </font>
-    <foreground_color>
-      <color name="White" red="255" green="255" blue="255">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color name="Primary Blue" red="0" green="148" blue="202">
-      </color>
-    </background_color>
-    <transparent>false</transparent>
-    <vertical_alignment>1</vertical_alignment>
-    <wrap_words>false</wrap_words>
+      <background_color>
+        <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+        </color>
+      </background_color>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Skid</name>
     <x>950</x>
-    <y>195</y>
+    <y>165</y>
     <width>90</width>
     <height>117</height>
     <style>3</style>
@@ -208,11 +258,11 @@
       <width>90</width>
       <height>117</height>
       <line_color>
-        <color name="Text" red="25" green="25" blue="25">
+        <color name="Text" red="0" green="0" blue="0">
         </color>
       </line_color>
       <background_color>
-        <color name="Grid" red="169" green="169" blue="169">
+        <color name="Grid" red="128" green="128" blue="128">
         </color>
       </background_color>
     </widget>
@@ -236,13 +286,13 @@
   <widget type="arc" version="2.0.0">
     <name>Arc</name>
     <x>360</x>
-    <y>404</y>
+    <y>374</y>
     <width>20</width>
     <height>20</height>
     <start_angle>270.0</start_angle>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -254,12 +304,12 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_5</name>
     <x>747</x>
-    <y>255</y>
+    <y>225</y>
     <width>40</width>
     <height>40</height>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -271,12 +321,12 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_4</name>
     <x>557</x>
-    <y>255</y>
+    <y>225</y>
     <width>40</width>
     <height>40</height>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -288,12 +338,12 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_3</name>
     <x>367</x>
-    <y>255</y>
+    <y>225</y>
     <width>40</width>
     <height>40</height>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -305,12 +355,12 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_1</name>
     <x>145</x>
-    <y>255</y>
+    <y>225</y>
     <width>40</width>
     <height>40</height>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -322,13 +372,13 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_6</name>
     <x>550</x>
-    <y>404</y>
+    <y>374</y>
     <width>20</width>
     <height>20</height>
     <start_angle>270.0</start_angle>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -340,13 +390,13 @@
   <widget type="arc" version="2.0.0">
     <name>Arc_7</name>
     <x>740</x>
-    <y>404</y>
+    <y>374</y>
     <width>20</width>
     <height>20</height>
     <start_angle>270.0</start_angle>
     <total_angle>180.0</total_angle>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <background_color>
@@ -358,11 +408,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_89</name>
     <x>181</x>
-    <y>415</y>
+    <y>385</y>
     <width>799</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -372,31 +422,14 @@
       </point>
     </points>
   </widget>
-  <widget type="polyline" version="2.0.0">
-    <name>Pipe 10000_95</name>
-    <x>980</x>
-    <y>285</y>
-    <width>1</width>
-    <height>131</height>
-    <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
-      </color>
-    </line_color>
-    <points>
-      <point x="0.0" y="0.0">
-      </point>
-      <point x="0.0" y="131.0">
-      </point>
-    </points>
-  </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_96</name>
-    <x>145</x>
-    <y>585</y>
+    <x>146</x>
+    <y>595</y>
     <width>875</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -409,28 +442,28 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_97</name>
     <x>1020</x>
-    <y>312</y>
+    <y>282</y>
     <width>1</width>
-    <height>274</height>
+    <height>313</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="274.0">
+      <point x="0.0" y="313.0">
       </point>
     </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_98</name>
     <x>980</x>
-    <y>355</y>
+    <y>325</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>2</arrows>
@@ -445,11 +478,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_99</name>
     <x>1020</x>
-    <y>355</y>
+    <y>325</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>1</arrows>
@@ -464,79 +497,79 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_108</name>
     <x>370</x>
-    <y>422</y>
+    <y>392</y>
     <width>1</width>
-    <height>163</height>
+    <height>203</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="162.99999999999997">
+      <point x="0.0" y="203.0">
       </point>
     </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_109</name>
     <x>560</x>
-    <y>422</y>
+    <y>392</y>
     <width>1</width>
-    <height>163</height>
+    <height>203</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="162.99999999999997">
+      <point x="0.0" y="203.0">
       </point>
     </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_110</name>
     <x>750</x>
-    <y>422</y>
+    <y>392</y>
     <width>1</width>
-    <height>163</height>
+    <height>203</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="162.99999999999997">
+      <point x="0.0" y="203.0">
       </point>
     </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_93</name>
     <x>147</x>
-    <y>275</y>
-    <width>1</width>
-    <height>310</height>
+    <y>245</y>
+    <width>3</width>
+    <height>350</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
       <point x="0.0" y="0.0">
       </point>
-      <point x="0.0" y="310.0">
+      <point x="0.0" y="350.0">
       </point>
     </points>
   </widget>
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_91</name>
     <x>183</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>140</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -549,11 +582,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_103</name>
     <x>369</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>130</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -566,11 +599,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_102</name>
     <x>405</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>140</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -583,11 +616,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_105</name>
     <x>559</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>130</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -600,11 +633,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_104</name>
     <x>595</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>140</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -617,11 +650,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_107</name>
     <x>749</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>130</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -634,11 +667,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_106</name>
     <x>785</x>
-    <y>275</y>
+    <y>245</y>
     <width>1</width>
     <height>140</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -651,11 +684,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_23</name>
     <x>123</x>
-    <y>385</y>
+    <y>355</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -668,11 +701,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_24</name>
     <x>345</x>
-    <y>385</y>
+    <y>355</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -685,11 +718,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_25</name>
     <x>535</x>
-    <y>385</y>
+    <y>355</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -702,11 +735,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_26</name>
     <x>725</x>
-    <y>385</y>
+    <y>355</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -719,11 +752,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_31</name>
     <x>123</x>
-    <y>445</y>
+    <y>415</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -736,11 +769,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_32</name>
     <x>345</x>
-    <y>445</y>
+    <y>415</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -753,11 +786,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_33</name>
     <x>535</x>
-    <y>445</y>
+    <y>415</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -770,11 +803,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_34</name>
     <x>725</x>
-    <y>445</y>
+    <y>415</y>
     <width>24</width>
     <height>1</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -787,11 +820,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_113</name>
     <x>846</x>
-    <y>416</y>
+    <y>386</y>
     <width>1</width>
     <height>25</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -804,11 +837,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_116</name>
     <x>866</x>
-    <y>391</y>
+    <y>361</y>
     <width>1</width>
     <height>25</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <points>
@@ -821,11 +854,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_111</name>
     <x>147</x>
-    <y>277</y>
+    <y>247</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>1</arrows>
@@ -840,11 +873,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_112</name>
     <x>369</x>
-    <y>277</y>
+    <y>247</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>1</arrows>
@@ -859,11 +892,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_114</name>
     <x>749</x>
-    <y>277</y>
+    <y>247</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>1</arrows>
@@ -878,11 +911,11 @@
   <widget type="polyline" version="2.0.0">
     <name>Pipe 10000_115</name>
     <x>559</x>
-    <y>277</y>
+    <y>247</y>
     <width>1</width>
     <height>10</height>
     <line_color>
-      <color name="Grid" red="169" green="169" blue="169">
+      <color red="0" green="0" blue="0">
       </color>
     </line_color>
     <arrows>1</arrows>
@@ -905,7 +938,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>635</x>
-    <y>365</y>
+    <y>335</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -922,7 +955,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>445</x>
-    <y>365</y>
+    <y>335</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -939,7 +972,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>255</x>
-    <y>365</y>
+    <y>335</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -956,7 +989,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>30</x>
-    <y>365</y>
+    <y>335</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -973,7 +1006,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>30</x>
-    <y>425</y>
+    <y>395</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -990,7 +1023,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>255</x>
-    <y>425</y>
+    <y>395</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -1007,7 +1040,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>445</x>
-    <y>425</y>
+    <y>395</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -1024,7 +1057,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>635</x>
-    <y>425</y>
+    <y>395</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -1037,10 +1070,10 @@
       <WIDDev>FIS</WIDDev>
       <WIDDis>WtrC</WIDDis>
       <WIDIndex>527</WIDIndex>
-      <WiDSecSub>TS2-010CRM</WiDSecSub>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>113</x>
-    <y>492</y>
+    <y>462</y>
     <width>139</width>
     <height>65</height>
     <resize>1</resize>
@@ -1052,10 +1085,10 @@
     <symbols>
       <symbol>../ts2-cryomodule/hand_valve.png</symbol>
     </symbols>
-    <x>730</x>
-    <y>325</y>
-    <width>40</width>
-    <height>35</height>
+    <x>718</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
     <tooltip>$(name)</tooltip>
   </widget>
   <widget type="symbol" version="2.0.0">
@@ -1063,10 +1096,10 @@
     <symbols>
       <symbol>../ts2-cryomodule/hand_valve.png</symbol>
     </symbols>
-    <x>540</x>
-    <y>325</y>
-    <width>40</width>
-    <height>35</height>
+    <x>528</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
     <tooltip>$(name)</tooltip>
   </widget>
   <widget type="symbol" version="2.0.0">
@@ -1074,10 +1107,10 @@
     <symbols>
       <symbol>../ts2-cryomodule/hand_valve.png</symbol>
     </symbols>
-    <x>350</x>
-    <y>325</y>
-    <width>40</width>
-    <height>35</height>
+    <x>338</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
     <tooltip>$(name)</tooltip>
   </widget>
   <widget type="symbol" version="2.0.0">
@@ -1085,10 +1118,10 @@
     <symbols>
       <symbol>../ts2-cryomodule/hand_valve.png</symbol>
     </symbols>
-    <x>127</x>
-    <y>325</y>
-    <width>40</width>
-    <height>35</height>
+    <x>115</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
     <tooltip>$(name)</tooltip>
   </widget>
   <widget type="embedded" version="2.0.0">
@@ -1102,24 +1135,7 @@
       <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>820</x>
-    <y>355</y>
-    <width>93</width>
-    <height>39</height>
-    <resize>1</resize>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_74</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
-    <macros>
-      <WIDDev>PT</WIDDev>
-      <WIDDis>WtrC</WIDDis>
-      <WIDIndex>501</WIDIndex>
-      <WIDLabel>Temperature</WIDLabel>
-      <WIDSecSub>TS2-010CRM</WIDSecSub>
-    </macros>
-    <x>800</x>
-    <y>435</y>
+    <y>325</y>
     <width>93</width>
     <height>39</height>
     <resize>1</resize>
@@ -1132,10 +1148,10 @@
       <WIDDev>FIS</WIDDev>
       <WIDDis>WtrC</WIDDis>
       <WIDIndex>537</WIDIndex>
-      <WiDSecSub>TS2-010CRM</WiDSecSub>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>336</x>
-    <y>492</y>
+    <y>462</y>
     <width>139</width>
     <height>65</height>
     <resize>1</resize>
@@ -1149,10 +1165,10 @@
       <WIDDev>FIS</WIDDev>
       <WIDDis>WtrC</WIDDis>
       <WIDIndex>547</WIDIndex>
-      <WiDSecSub>TS2-010CRM</WiDSecSub>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>525</x>
-    <y>492</y>
+    <y>462</y>
     <width>139</width>
     <height>65</height>
     <resize>1</resize>
@@ -1166,13 +1182,145 @@
       <WIDDev>FIS</WIDDev>
       <WIDDis>WtrC</WIDDis>
       <WIDIndex>557</WIDIndex>
-      <WiDSecSub>TS2-010CRM</WiDSecSub>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>716</x>
-    <y>492</y>
+    <y>462</y>
     <width>139</width>
     <height>65</height>
     <resize>1</resize>
     <transparent>true</transparent>
   </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_40</name>
+    <width>1060</width>
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_277</name>
+    <text>TS2 Cooling Water System</text>
+    <x>14</x>
+    <width>636</width>
+    <height>50</height>
+    <font>
+      <font 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>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Analog_TRANSMITTER_OnlyText_Vertical_BlockIcon_74</name>
+    <file>../../ICS_OPI_LIBRARY/DeviceTypes/AnalogMeasure/AnalogTransmitter_BlockIcon_OnlyText_Vertical_Compact.bob</file>
+    <macros>
+      <WIDDev>PT</WIDDev>
+      <WIDDis>WtrC</WIDDis>
+      <WIDIndex>501</WIDIndex>
+      <WIDLabel>Temperature</WIDLabel>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
+    </macros>
+    <x>800</x>
+    <y>410</y>
+    <width>93</width>
+    <height>39</height>
+    <resize>1</resize>
+    <transparent>true</transparent>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q019</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>151</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q020</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>373</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q021</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>563</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q022</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>753</x>
+    <y>280</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q040</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>115</x>
+    <y>530</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q041</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>338</x>
+    <y>530</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q042</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>528</x>
+    <y>530</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
+  <widget type="symbol" version="2.0.0">
+    <name>Q043</name>
+    <symbols>
+      <symbol>../ts2-cryomodule/hand_valve.png</symbol>
+    </symbols>
+    <x>718</x>
+    <y>530</y>
+    <width>65</width>
+    <height>65</height>
+    <tooltip>$(name)</tooltip>
+  </widget>
 </display>