diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Alarms.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Alarms.bob
new file mode 100644
index 0000000000000000000000000000000000000000..92c8353feb0fb73118998ad7d8865027ec393666
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Alarms.bob
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : Alarms</name>
+  <class></class>
+  <macros>
+    <sectName>CWM-CWS05</sectName>
+  </macros>
+  <width>2310</width>
+  <height>900</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground</name>
+    <x>1650</x>
+    <y>70</y>
+    <width>640</width>
+    <height>600</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="label" version="2.0.0">
+    <name>GroupTitle</name>
+    <text>Temperatures</text>
+    <x>1650</x>
+    <y>70</y>
+    <width>640</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2310</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Water Skid : $(sectName) - Alarms</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1100</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>330</x>
+    <y>570</y>
+    <width>640</width>
+    <height>130</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="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Conductivities</text>
+    <x>330</x>
+    <y>570</y>
+    <width>640</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_29</name>
+    <file>../99-Shared/Embedded/SYS_alarms.bob</file>
+    <x>20</x>
+    <y>70</y>
+    <width>290</width>
+    <height>670</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_3</name>
+    <x>330</x>
+    <y>70</y>
+    <width>640</width>
+    <height>480</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="embedded" version="2.0.0">
+    <name>Embedded Display_22</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-576</DevName>
+      <chName>FT-576</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>180</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_3</name>
+    <text>Flows</text>
+    <x>330</x>
+    <y>70</y>
+    <width>640</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_24</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-595</DevName>
+      <chName>FT-595</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>240</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_25</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-527</DevName>
+      <chName>FT-527</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>300</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_26</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-537</DevName>
+      <chName>FT-537</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>360</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_27</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-547</DevName>
+      <chName>FT-547</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>420</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_28</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-557</DevName>
+      <chName>FT-557</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>480</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_23</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-FT-515</DevName>
+      <chName>FT-515</chName>
+      <readVal>Flow_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>120</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_5</name>
+    <actions>
+      <action type="open_display">
+        <file>Overview.bob</file>
+        <target>replace</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Overview</text>
+    <x>2170</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_1</name>
+    <x>990</x>
+    <y>70</y>
+    <width>640</width>
+    <height>660</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="label" version="2.0.0">
+    <name>GroupTitle_1</name>
+    <text>Pressures</text>
+    <x>990</x>
+    <y>70</y>
+    <width>640</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_14</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-555</DevName>
+      <chName>PT-555</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>660</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_13</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-545</DevName>
+      <chName>PT-545</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>600</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_12</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-535</DevName>
+      <chName>PT-535</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>540</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_11</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-525</DevName>
+      <chName>PT-525</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>480</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_9</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO.bob</file>
+    <macros>
+      <DevName>WtrC-PT-501</DevName>
+      <chName>PT-501</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>420</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_8</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-577</DevName>
+      <chName>PT-577</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>320</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_7</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-566</DevName>
+      <chName>PT-566</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>220</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_10</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-PT-511</DevName>
+      <chName>PT-511</chName>
+      <readVal>Press_MeasValue</readVal>
+    </macros>
+    <x>1010</x>
+    <y>120</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_2</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-514</DevName>
+      <chName>TT-514</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>120</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-565</DevName>
+      <chName>TT-565</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>220</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_1</name>
+    <file>../99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-575</DevName>
+      <chName>TT-575</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>320</y>
+    <width>600</width>
+    <height>90</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_5</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-526</DevName>
+      <chName>TT-526</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>420</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_4</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-536</DevName>
+      <chName>TT-536</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>480</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_3</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-546</DevName>
+      <chName>TT-546</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>540</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_6</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-TT-556</DevName>
+      <chName>TT-556</chName>
+      <readVal>Temp_MeasValue</readVal>
+    </macros>
+    <x>1670</x>
+    <y>600</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+  <widget type="embedded" version="2.0.0">
+    <name>Embedded Display_31</name>
+    <file>../99-Shared/Embedded/alarms_HI_HIHI.bob</file>
+    <macros>
+      <DevName>WtrC-CT-513</DevName>
+      <chName>CT-513</chName>
+      <readVal>Cond_MeasValue</readVal>
+    </macros>
+    <x>350</x>
+    <y>630</y>
+    <width>600</width>
+    <height>50</height>
+    <resize>2</resize>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob
index f9abdd561d7764830374b6d7804d19e70cd42bb0..5dc1f24f788f854f2c2016ff8b56c361b2aa6a60 100644
--- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob
@@ -284,7 +284,6 @@
     <y>710</y>
     <width>170</width>
     <height>30</height>
-    <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
@@ -361,7 +360,6 @@
     <y>850</y>
     <width>170</width>
     <height>30</height>
-    <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="label" version="2.0.0">
@@ -381,7 +379,6 @@
     <y>890</y>
     <width>170</width>
     <height>30</height>
-    <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="group" version="2.0.0">
@@ -1032,6 +1029,40 @@
     <height>40</height>
     <tooltip>$(actions)</tooltip>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>iGotHeartbeat:</text>
+    <x>50</x>
+    <y>1030</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>iKickAlive:</text>
+    <x>50</x>
+    <y>1070</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iGotHeartbeat</pv_name>
+    <x>180</x>
+    <y>1030</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iKickAlive</pv_name>
+    <x>180</x>
+    <y>1070</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>GroupBackground_24</name>
     <x>20</x>
@@ -1150,38 +1181,19 @@
     <height>30</height>
     <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_20</name>
-    <text>AliveR:</text>
-    <x>70</x>
-    <y>1030</y>
-    <width>90</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_21</name>
-    <text>CommsOK:</text>
-    <x>70</x>
-    <y>1070</y>
-    <width>90</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_21</name>
-    <pv_name>$(sectName):Ctrl-PLC-001:AliveR</pv_name>
-    <x>170</x>
-    <y>1030</y>
-    <width>150</width>
-    <height>30</height>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_22</name>
-    <pv_name>$(sectName):Ctrl-PLC-001:CommsOK</pv_name>
-    <x>170</x>
-    <y>1070</y>
-    <width>150</width>
-    <height>30</height>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_5</name>
+    <actions>
+      <action type="open_display">
+        <file>Alarms.bob</file>
+        <target>replace</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Alarms</text>
+    <x>1940</x>
+    <y>10</y>
+    <width>120</width>
+    <tooltip>$(actions)</tooltip>
   </widget>
 </display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&ID.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&ID.bob
new file mode 100644
index 0000000000000000000000000000000000000000..8c91fca86637c7593268e9722e6b907331fefc01
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&ID.bob
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>TS2 Water Skid : P&amp;ID</name>
+  <class></class>
+  <macros>
+    <sectName>CWM-CWS05</sectName>
+  </macros>
+  <width>2080</width>
+  <height>1150</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2080</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Water Skid : $(sectName) - P&amp;ID</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1100</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&IDx.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&IDx.bob
new file mode 100644
index 0000000000000000000000000000000000000000..0774ffc8fab462e3c6e045bcc6f56df4728f8b98
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/P&IDx.bob
@@ -0,0 +1,1184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>X</name>
+  <class></class>
+  <macros>
+    <sectName>CWM-CWS05</sectName>
+  </macros>
+  <width>2080</width>
+  <height>1150</height>
+  <background_color>
+    <color name="BACKGROUND" red="220" green="225" blue="221">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>titleBar</name>
+    <class>TITLE-BAR</class>
+    <x use_class="true">0</x>
+    <y use_class="true">0</y>
+    <width>2080</width>
+    <height use_class="true">50</height>
+    <line_width use_class="true">0</line_width>
+    <background_color use_class="true">
+      <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>title</name>
+    <class>TITLE</class>
+    <text>Water Skid : $(sectName) - P&amp;ID</text>
+    <x use_class="true">20</x>
+    <y use_class="true">0</y>
+    <width>1100</width>
+    <height use_class="true">50</height>
+    <font use_class="true">
+      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <transparent use_class="true">true</transparent>
+    <horizontal_alignment use_class="true">0</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_4</name>
+    <x>20</x>
+    <y>310</y>
+    <width>400</width>
+    <height>280</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="label" version="2.0.0">
+    <name>GroupTitle_4</name>
+    <text>System</text>
+    <x>20</x>
+    <y>310</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_10</name>
+    <x>40</x>
+    <y>360</y>
+    <width>360</width>
+    <height>90</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="label" version="2.0.0">
+    <name>Label</name>
+    <text>Alarms:</text>
+    <x>50</x>
+    <y>370</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update</name>
+    <pv_name>$(sectName)::Alarm</pv_name>
+    <x>150</x>
+    <y>370</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_1</name>
+    <actions>
+      <action type="write_pv">
+        <pv_name>$(sectName)::Cmd_ResetAlarms</pv_name>
+        <value>1</value>
+        <description>Reset</description>
+      </action>
+    </actions>
+    <text>Reset</text>
+    <x>330</x>
+    <y>370</y>
+    <width>60</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_11</name>
+    <x>40</x>
+    <y>460</y>
+    <width>360</width>
+    <height>50</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="label" version="2.0.0">
+    <name>Label_1</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>470</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_1</name>
+    <pv_name>$(sectName)::SystemStatus</pv_name>
+    <x>150</x>
+    <y>470</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_12</name>
+    <x>40</x>
+    <y>520</y>
+    <width>280</width>
+    <height>50</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="label" version="2.0.0">
+    <name>Label_2</name>
+    <text>DC Supply:</text>
+    <x>50</x>
+    <y>530</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_2</name>
+    <pv_name>$(sectName)::PowerSupplyStatus</pv_name>
+    <x>150</x>
+    <y>530</y>
+    <width>160</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_3</name>
+    <pv_name>$(sectName)::Trip</pv_name>
+    <x>150</x>
+    <y>410</y>
+    <width>240</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_3</name>
+    <text>TRIP Present:</text>
+    <x>50</x>
+    <y>410</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_5</name>
+    <x>20</x>
+    <y>610</y>
+    <width>400</width>
+    <height>160</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="label" version="2.0.0">
+    <name>GroupTitle_5</name>
+    <text>Pump</text>
+    <x>20</x>
+    <y>610</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_13</name>
+    <x>40</x>
+    <y>660</y>
+    <width>360</width>
+    <height>90</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="label" version="2.0.0">
+    <name>Label_4</name>
+    <text>Status:</text>
+    <x>50</x>
+    <y>670</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_4</name>
+    <pv_name>$(sectName):WtrC-P-510:Status</pv_name>
+    <x>150</x>
+    <y>670</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_5</name>
+    <pv_name>$(sectName):WtrC-P-510:ActualSpeed</pv_name>
+    <x>150</x>
+    <y>710</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_7</name>
+    <text>Speed:</text>
+    <x>50</x>
+    <y>710</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_6</name>
+    <x>20</x>
+    <y>790</y>
+    <width>400</width>
+    <height>160</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="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>Conductivities</text>
+    <x>20</x>
+    <y>790</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_15</name>
+    <x>40</x>
+    <y>840</y>
+    <width>360</width>
+    <height>90</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="label" version="2.0.0">
+    <name>Label_15</name>
+    <text>Measured:</text>
+    <x>50</x>
+    <y>850</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_7</name>
+    <pv_name>$(sectName):WtrC-CT-513:Cond_MeasValue</pv_name>
+    <x>150</x>
+    <y>850</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_16</name>
+    <text>Setpoint:</text>
+    <x>50</x>
+    <y>890</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_9</name>
+    <pv_name>$(sectName):WtrC-CT-513:Setpoint</pv_name>
+    <x>150</x>
+    <y>890</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>TemperatureGroup</name>
+    <x>1260</x>
+    <y>70</y>
+    <width>390</width>
+    <height>480</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground</name>
+      <width>390</width>
+      <height>480</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="label" version="2.0.0">
+      <name>GroupTitle</name>
+      <text>Temperatures</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-565</DevName>
+        <subScreen>../Sub/TT565_575.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_1</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-575</DevName>
+        <subScreen>../Sub/TT565_575.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_3</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-546</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_4</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-536</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_5</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-526</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_6</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-556</DevName>
+        <subScreen>../Sub/TT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_2</name>
+      <file>../99-Shared/Embedded/TT.bob</file>
+      <macros>
+        <DevName>WtrC-TT-514</DevName>
+        <subScreen>../Sub/TT514.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>PressuresGroup</name>
+    <x>850</x>
+    <y>70</y>
+    <width>390</width>
+    <height>540</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_1</name>
+      <width>390</width>
+      <height>540</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="label" version="2.0.0">
+      <name>GroupTitle_1</name>
+      <text>Pressures</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_7</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-566</DevName>
+        <subScreen>../Sub/PT566_577.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_8</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-577</DevName>
+        <subScreen>../Sub/PT566_577.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_9</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-501</DevName>
+        <subScreen>../Sub/PT501.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_11</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-525</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_12</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-535</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_13</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-545</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_14</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-555</DevName>
+        <subScreen>../Sub/PT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>470</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_10</name>
+      <file>../99-Shared/Embedded/PT.bob</file>
+      <macros>
+        <DevName>WtrC-PT-511</DevName>
+        <subScreen>../Sub/PT511.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>ValvesGroup</name>
+    <x>1670</x>
+    <y>70</y>
+    <width>390</width>
+    <height>490</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_2</name>
+      <width>390</width>
+      <height>490</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="embedded" version="2.0.0">
+      <name>Embedded Display_15</name>
+      <file>../99-Shared/Embedded/YCV.bob</file>
+      <macros>
+        <DevName>WtrC-YCV-568</DevName>
+        <subScreen>../Sub/YCV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle_2</name>
+      <text>Valves</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_16</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-572</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>120</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_17</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-528</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>180</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_18</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-538</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>240</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_19</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-548</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>300</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_20</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-558</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>360</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_21</name>
+      <file>../99-Shared/Embedded/YSV.bob</file>
+      <macros>
+        <DevName>WtrC-YSV-596</DevName>
+        <subScreen>../Sub/YSV.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>420</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="group" version="2.0.0">
+    <name>FlowsGroup</name>
+    <x>440</x>
+    <y>70</y>
+    <width>390</width>
+    <height>480</height>
+    <style>3</style>
+    <transparent>true</transparent>
+    <widget type="rectangle" version="2.0.0">
+      <name>GroupBackground_3</name>
+      <width>390</width>
+      <height>480</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="embedded" version="2.0.0">
+      <name>Embedded Display_22</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-576</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>110</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="label" version="2.0.0">
+      <name>GroupTitle_3</name>
+      <text>Flows</text>
+      <width>390</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+      <wrap_words>false</wrap_words>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_24</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-595</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>170</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_25</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-527</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>230</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_26</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-537</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>290</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_27</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-547</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>350</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_28</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-557</DevName>
+        <subScreen>../Sub/FT.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>410</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+    <widget type="embedded" version="2.0.0">
+      <name>Embedded Display_23</name>
+      <file>../99-Shared/Embedded/FT.bob</file>
+      <macros>
+        <DevName>WtrC-FT-515</DevName>
+        <subScreen>../Sub/FT515.bob</subScreen>
+      </macros>
+      <x>20</x>
+      <y>50</y>
+      <width>350</width>
+      <height>50</height>
+      <resize>2</resize>
+    </widget>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/CT.bob</file>
+        <macros>
+          <DevName>WtrC-CT-513</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>865</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_2</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/P.bob</file>
+        <macros>
+          <DevName>WtrC-P-510</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>685</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="action_button" version="3.0.0">
+    <name>Action Button_3</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/SYS.bob</file>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>530</y>
+    <width>70</width>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_7</name>
+    <x>20</x>
+    <y>970</y>
+    <width>400</width>
+    <height>160</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="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>PLC</text>
+    <x>20</x>
+    <y>970</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_16</name>
+    <x>40</x>
+    <y>1020</y>
+    <width>360</width>
+    <height>90</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>Action Button_4</name>
+    <actions>
+      <action type="open_display">
+        <file>../99-Shared/Sub/PLC.bob</file>
+        <macros>
+          <DevName>Ctrl-PLC-001</DevName>
+        </macros>
+        <target>window</target>
+        <description>Open Display</description>
+      </action>
+    </actions>
+    <text>Details</text>
+    <x>330</x>
+    <y>1045</y>
+    <width>60</width>
+    <height>40</height>
+    <tooltip>$(actions)</tooltip>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_19</name>
+    <text>iGotHeartbeat:</text>
+    <x>50</x>
+    <y>1030</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_20</name>
+    <text>iKickAlive:</text>
+    <x>50</x>
+    <y>1070</y>
+    <width>120</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_11</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iGotHeartbeat</pv_name>
+    <x>180</x>
+    <y>1030</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):Ctrl-PLC-001:iKickAlive</pv_name>
+    <x>180</x>
+    <y>1070</y>
+    <width>140</width>
+    <height>30</height>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_24</name>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>220</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="label" version="2.0.0">
+    <name>GroupTitle_24</name>
+    <text>IOC</text>
+    <x>20</x>
+    <y>70</y>
+    <width>400</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_31</name>
+    <x>40</x>
+    <y>180</y>
+    <width>360</width>
+    <height>90</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="textupdate" version="2.0.0">
+    <name>Text Update_39</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:MEM_USED</pv_name>
+    <x>170</x>
+    <y>190</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_234</name>
+    <text>Memory Used:</text>
+    <x>50</x>
+    <y>190</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_40</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:MEM_FREE</pv_name>
+    <x>170</x>
+    <y>230</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_235</name>
+    <text>Free Memory:</text>
+    <x>50</x>
+    <y>230</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_33</name>
+    <x>40</x>
+    <y>120</y>
+    <width>360</width>
+    <height>50</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="label" version="2.0.0">
+    <name>Label_238</name>
+    <text>Hostname:</text>
+    <x>50</x>
+    <y>130</y>
+    <width>110</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_43</name>
+    <pv_name>$(sectName):Ctrl-IOC-001:HOSTNAME</pv_name>
+    <x>170</x>
+    <y>130</y>
+    <width>220</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/SYS_alarms.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/SYS_alarms.bob
new file mode 100644
index 0000000000000000000000000000000000000000..405081225883df0ce15bd2e2d731c6285af1fb0c
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/SYS_alarms.bob
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Sys Alarms</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>290</width>
+  <height>670</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_14</name>
+    <width>290</width>
+    <height>670</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="label" version="2.0.0">
+    <name>GroupTitle_14</name>
+    <text>Alarms</text>
+    <width>290</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_21</name>
+    <x>20</x>
+    <y>50</y>
+    <width>250</width>
+    <height>490</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="label" version="2.0.0">
+    <name>Label_111</name>
+    <text>Phase fail:</text>
+    <x>30</x>
+    <y>60</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_112</name>
+    <text>DC Power Supply fault:</text>
+    <x>30</x>
+    <y>100</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_113</name>
+    <text>PSU Overload fault:</text>
+    <x>30</x>
+    <y>140</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_114</name>
+    <text>Battery fault:</text>
+    <x>30</x>
+    <y>180</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_115</name>
+    <text>Battery Low Voltage:</text>
+    <x>30</x>
+    <y>220</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_116</name>
+    <text>Sensor fault:</text>
+    <x>30</x>
+    <y>260</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_117</name>
+    <text>Device fault:</text>
+    <x>30</x>
+    <y>300</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_118</name>
+    <text>Flow / Level fault:</text>
+    <x>30</x>
+    <y>340</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_119</name>
+    <text>Water quality fault:</text>
+    <x>30</x>
+    <y>380</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_120</name>
+    <text>Pressure fault:</text>
+    <x>30</x>
+    <y>420</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_121</name>
+    <text>Temperatur fault:</text>
+    <x>30</x>
+    <y>460</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_122</name>
+    <text>Pump 1 Alarm:</text>
+    <x>30</x>
+    <y>500</y>
+    <width>180</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_3</name>
+    <pv_name>$(sectName)::Phase</pv_name>
+    <x>220</x>
+    <y>65</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_4</name>
+    <pv_name>$(sectName)::PSUStatus</pv_name>
+    <x>220</x>
+    <y>105</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName)::PSUOVerload</pv_name>
+    <x>220</x>
+    <y>145</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName)::BatteryStatus</pv_name>
+    <x>220</x>
+    <y>185</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(sectName)::BatteryVoltage</pv_name>
+    <x>220</x>
+    <y>225</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_8</name>
+    <pv_name>$(sectName)::SensorFault</pv_name>
+    <x>220</x>
+    <y>265</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_9</name>
+    <pv_name>$(sectName)::DeviceFault</pv_name>
+    <x>220</x>
+    <y>305</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_10</name>
+    <pv_name>$(sectName)::FlowLevelFault</pv_name>
+    <x>220</x>
+    <y>345</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_11</name>
+    <pv_name>$(sectName)::WaterQualityFault</pv_name>
+    <x>220</x>
+    <y>385</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_12</name>
+    <pv_name>$(sectName)::PressureFault</pv_name>
+    <x>220</x>
+    <y>425</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_13</name>
+    <pv_name>$(sectName)::TemperatureFault</pv_name>
+    <x>220</x>
+    <y>465</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_14</name>
+    <pv_name>$(sectName)::PumpFault</pv_name>
+    <x>220</x>
+    <y>505</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_23</name>
+    <x>20</x>
+    <y>560</y>
+    <width>250</width>
+    <height>90</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="label" version="2.0.0">
+    <name>Label_212</name>
+    <text>Alarms:</text>
+    <x>30</x>
+    <y>570</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_18</name>
+    <pv_name>$(sectName)::Alarm</pv_name>
+    <x>130</x>
+    <y>570</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_21</name>
+    <pv_name>$(sectName)::Trip</pv_name>
+    <x>130</x>
+    <y>610</y>
+    <width>130</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_215</name>
+    <text>TRIP Present:</text>
+    <x>30</x>
+    <y>610</y>
+    <width>90</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_HI_HIHI.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_HI_HIHI.bob
new file mode 100644
index 0000000000000000000000000000000000000000..8d75457582335826cc85ffa695f5234939ed2f1f
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_HI_HIHI.bob
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Alarms HI</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>600</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="label" version="2.0.0">
+    <name>GroupTitle_7</name>
+    <text>$(chName)</text>
+    <width>570</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <width>600</width>
+    <height>50</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="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>$(chName)</text>
+    <x>10</x>
+    <y>10</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_32</name>
+    <text>HI:</text>
+    <x>140</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_33</name>
+    <text>HIHI:</text>
+    <x>370</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_34</name>
+    <text>Limit:</text>
+    <x>210</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_35</name>
+    <text>Limit:</text>
+    <x>440</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+    <x>290</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+    <x>510</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>200</x>
+    <y>15</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>430</x>
+    <y>15</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):$(readVal)</pv_name>
+    <x>90</x>
+    <y>10</y>
+    <width>70</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO.bob
new file mode 100644
index 0000000000000000000000000000000000000000..cc0b796993177a81a8548b3e94343182ae15f8be
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO.bob
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Alarms LO</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>600</width>
+  <height>50</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <width>600</width>
+    <height>50</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="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>LO:</text>
+    <x>140</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>LOLO:</text>
+    <x>370</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>Limit:</text>
+    <x>210</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>Limit:</text>
+    <x>440</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_15</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+    <x>290</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+    <x>510</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>200</x>
+    <y>15</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>430</x>
+    <y>15</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>$(chName)</text>
+    <x>10</x>
+    <y>10</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):$(readVal)</pv_name>
+    <x>90</x>
+    <y>10</y>
+    <width>70</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob
new file mode 100644
index 0000000000000000000000000000000000000000..d0ca80ae69d20ba735f431c2668db7043572b3fd
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_LO_LOLO_HI_HIHI.bob
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Alarms LO HI</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>600</width>
+  <height>90</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>BGGrey03-background_18</name>
+    <width>600</width>
+    <height>90</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="label" version="2.0.0">
+    <name>Label_31</name>
+    <text>$(chName)</text>
+    <x>10</x>
+    <y>10</y>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_28</name>
+    <text>LO:</text>
+    <x>140</x>
+    <y>50</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_29</name>
+    <text>LOLO:</text>
+    <x>370</x>
+    <y>50</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_30</name>
+    <text>Limit:</text>
+    <x>210</x>
+    <y>50</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_32</name>
+    <text>Limit:</text>
+    <x>440</x>
+    <y>50</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_16</name>
+    <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+    <x>290</x>
+    <y>50</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_17</name>
+    <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+    <x>510</x>
+    <y>50</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):LO</pv_name>
+    <x>200</x>
+    <y>55</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):LOLO</pv_name>
+    <x>430</x>
+    <y>55</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_19</name>
+    <pv_name>$(sectName):$(DevName):$(readVal)</pv_name>
+    <x>10</x>
+    <y>50</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_33</name>
+    <text>HI:</text>
+    <x>140</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_34</name>
+    <text>HIHI:</text>
+    <x>370</x>
+    <y>10</y>
+    <width>50</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_35</name>
+    <text>Limit:</text>
+    <x>210</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_36</name>
+    <text>Limit:</text>
+    <x>440</x>
+    <y>10</y>
+    <width>60</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_20</name>
+    <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+    <x>290</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_21</name>
+    <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+    <x>510</x>
+    <y>10</y>
+    <width>80</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(sectName):$(DevName):HI</pv_name>
+    <x>200</x>
+    <y>15</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_8</name>
+    <pv_name>$(sectName):$(DevName):HIHI</pv_name>
+    <x>430</x>
+    <y>15</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_YCV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_YCV.bob
new file mode 100644
index 0000000000000000000000000000000000000000..967606f72b2ed0858136da839b24713a898ea4f5
--- /dev/null
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/alarms_YCV.bob
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+  <name>Alarms YCV</name>
+  <class></class>
+  <macros>
+    <ArrayX>-TR1-ArrayTimeUs</ArrayX>
+    <ArrayY>-TR1-ArrayData</ArrayY>
+    <LABAMC>Ctrl-AMC-005</LABAMC>
+    <LABBCM>LAB-BCM08</LABBCM>
+  </macros>
+  <width>330</width>
+  <height>160</height>
+  <background_color>
+    <color name="Transparent" red="255" green="255" blue="255" alpha="0">
+    </color>
+  </background_color>
+  <widget type="rectangle" version="2.0.0">
+    <name>GroupBackground_11</name>
+    <width>330</width>
+    <height>160</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_14</name>
+    <x>20</x>
+    <y>50</y>
+    <width>290</width>
+    <height>90</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="label" version="2.0.0">
+    <name>GroupTitle_6</name>
+    <text>YCV</text>
+    <width>330</width>
+    <height>50</height>
+    <font>
+      <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.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>
+    <wrap_words>false</wrap_words>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_11</name>
+    <text>Opening:</text>
+    <x>30</x>
+    <y>60</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_13</name>
+    <text>Sensor:</text>
+    <x>30</x>
+    <y>100</y>
+    <width>80</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_12</name>
+    <pv_name>$(sectName):$(DevName):OpeningFault</pv_name>
+    <x>120</x>
+    <y>60</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>Text Update_13</name>
+    <pv_name>$(sectName):$(DevName):SensorFault</pv_name>
+    <x>120</x>
+    <y>100</y>
+    <width>170</width>
+    <height>30</height>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob
index 79bcdd91ea0b4ae600e2e7a9c6cf7995b3251b38..e1c01febebf24ed0845ae7d892eee90ee1921469 100644
--- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob
+++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob
@@ -8,7 +8,7 @@
     <LABAMC>Ctrl-AMC-005</LABAMC>
     <LABBCM>LAB-BCM08</LABBCM>
   </macros>
-  <width>1100</width>
+  <width>700</width>
   <height>690</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
     <class>TITLE-BAR</class>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>1100</width>
+    <width>700</width>
     <height use_class="true">50</height>
     <line_width use_class="true">0</line_width>
     <background_color use_class="true">
@@ -33,7 +33,7 @@
     <text>TS2 Water Skid : $(sectName):$(DevName)</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
-    <width>1000</width>
+    <width>670</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">
@@ -220,16 +220,6 @@
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_18</name>
-    <text>Current Overload:</text>
-    <x>470</x>
-    <y>210</y>
-    <width>130</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
   <widget type="led" version="2.0.0">
     <name>LED</name>
     <pv_name>$(sectName):$(DevName):InverterFault</pv_name>
@@ -250,56 +240,6 @@
       </color>
     </on_color>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_2</name>
-    <pv_name>$(sectName):$(DevName):BasePressureFault</pv_name>
-    <x>610</x>
-    <y>215</y>
-    <on_color>
-      <color name="MAJOR" red="252" green="13" blue="27">
-      </color>
-    </on_color>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_3</name>
-    <pv_name>$(sectName):$(DevName):CurrentOverload</pv_name>
-    <x>610</x>
-    <y>255</y>
-    <on_color>
-      <color name="MAJOR" red="252" green="13" blue="27">
-      </color>
-    </on_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_19</name>
-    <text>Base pressure:</text>
-    <x>470</x>
-    <y>250</y>
-    <width>130</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_20</name>
-    <text>Base pressure low:</text>
-    <x>470</x>
-    <y>290</y>
-    <width>130</width>
-    <height>30</height>
-    <horizontal_alignment>2</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED_4</name>
-    <pv_name>$(sectName):$(DevName):CurrentOverload</pv_name>
-    <x>610</x>
-    <y>295</y>
-    <on_color>
-      <color name="MINOR" red="252" green="242" blue="17">
-      </color>
-    </on_color>
-  </widget>
   <widget type="rectangle" version="2.0.0">
     <name>GroupBackground_7</name>
     <x>20</x>
@@ -554,4 +494,64 @@
     <precision>2</precision>
     <vertical_alignment>1</vertical_alignment>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_25</name>
+    <text>Current Overload:</text>
+    <x>470</x>
+    <y>210</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_5</name>
+    <pv_name>$(sectName):$(DevName):CurrentOverload</pv_name>
+    <x>610</x>
+    <y>215</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_6</name>
+    <pv_name>$(sectName):$(DevName):BasePressureFault</pv_name>
+    <x>610</x>
+    <y>255</y>
+    <on_color>
+      <color name="MAJOR" red="252" green="13" blue="27">
+      </color>
+    </on_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_26</name>
+    <text>Base pressure:</text>
+    <x>470</x>
+    <y>250</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_27</name>
+    <text>Base pressure low:</text>
+    <x>470</x>
+    <y>290</y>
+    <width>130</width>
+    <height>30</height>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="led" version="2.0.0">
+    <name>LED_7</name>
+    <pv_name>$(sectName):$(DevName):BasePressureLow</pv_name>
+    <x>610</x>
+    <y>295</y>
+    <on_color>
+      <color name="MINOR" red="252" green="242" blue="17">
+      </color>
+    </on_color>
+  </widget>
 </display>