diff --git a/99-Shared/mrfioc2_new/_evroutput.bob b/99-Shared/mrfioc2_new/_evroutput.bob
index 649879f792dc39d05910cc1249cb534b4d480fcc..b513ecd5b6b55fc6e52ec1ff9eec48663a55fb35 100644
--- a/99-Shared/mrfioc2_new/_evroutput.bob
+++ b/99-Shared/mrfioc2_new/_evroutput.bob
@@ -68,7 +68,7 @@ elif pv0 == 'Pulser 7':
 	widget.setPropertyValue('background_color', color_dark_blue)
 else:
 	widget.setPropertyValue('background_color', color_bg)]]></text>
-        <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+        <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
       </script>
     </scripts>
   </widget>
@@ -157,13 +157,13 @@ else:
 	widget.setPropertyValue('line_color', colorCurrent)
 	widget.setPropertyValue('line_width', 0)
 ]]></text>
-        <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+        <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
       </script>
     </scripts>
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button</name>
-    <pv_name>$(P)$(R)Out$(O)-Src-Pulse-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-Pulse-SP</pv_name>
     <x>230</x>
     <y>10</y>
     <width>90</width>
@@ -200,14 +200,14 @@ if (pv0 == "Pulser 0") or (pv0 == "Pulser 1") or (pv0 == "Pulser 2") or (pv0 ==
 else:
     widget.setPropertyValue('background_color', colorCurrent)
 ]]></text>
-        <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+        <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
       </script>
     </scripts>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_3</name>
-    <pv_name>$(P)$(R)Out$(O)-Src-SP.DESC</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-SP.DESC</pv_name>
     <x>10</x>
     <y>10</y>
     <width>65</width>
@@ -228,7 +228,7 @@ else:
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_3</name>
-    <pv_name>$(P)$(R)Out$(O)-Src-DBus-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-DBus-SP</pv_name>
     <x>440</x>
     <y>10</y>
     <width>80</width>
@@ -264,14 +264,14 @@ if (pv0 == 'DBus 0') or (pv0 == 'DBus 1') or (pv0 == 'DBus 2') or (pv0 == 'DBus
 	widget.setPropertyValue('background_color', colorVal0)
 else:
 	widget.setPropertyValue('background_color', colorCurrent)]]></text>
-        <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+        <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
       </script>
     </scripts>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="combo" version="2.0.0">
     <name>Menu Button_4</name>
-    <pv_name>$(P)$(R)Out$(O)-Src-Scale-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-Scale-SP</pv_name>
     <x>330</x>
     <y>10</y>
     <height>20</height>
@@ -307,14 +307,14 @@ if (pv0 == 'Prescaler 0') or (pv0 == 'Prescaler 1') or (pv0 == 'Prescaler 2') or
 else:
 	widget.setPropertyValue('background_color', colorCurrent)
 ]]></text>
-        <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+        <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
       </script>
     </scripts>
     <border_alarm_sensitive>false</border_alarm_sensitive>
   </widget>
   <widget type="textentry" version="3.0.0">
     <name>Text Input_6</name>
-    <pv_name>$(P)$(R)Out$(O)-Label-I</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Label-I</pv_name>
     <x>90</x>
     <y>10</y>
     <width>120</width>
@@ -333,7 +333,7 @@ else:
   </widget>
   <widget type="textupdate" version="2.0.0">
     <name>Text Update_1</name>
-    <pv_name>$(P)$(R)Out$(O)-Src-RB</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-RB</pv_name>
     <x>655</x>
     <y>10</y>
     <width>80</width>
@@ -357,7 +357,7 @@ else:
         <description>Write PV</description>
       </action>
     </actions>
-    <pv_name>$(P)$(R)Out$(O)-Src-Scale-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-Scale-SP</pv_name>
     <text>High</text>
     <x>530</x>
     <y>10</y>
@@ -378,7 +378,7 @@ else:
         <description>Write PV</description>
       </action>
     </actions>
-    <pv_name>$(P)$(R)Out$(O)-Src-Scale-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-Scale-SP</pv_name>
     <text>Low</text>
     <x>565</x>
     <y>10</y>
@@ -399,7 +399,7 @@ else:
         <description>Write PV</description>
       </action>
     </actions>
-    <pv_name>$(P)$(R)Out$(O)-Src-Scale-SP</pv_name>
+    <pv_name>$(P)$(R)Out-$(O)-Src-Scale-SP</pv_name>
     <text>Tri.</text>
     <x>600</x>
     <y>10</y>
diff --git a/99-Shared/mrfioc2_new/_pulsers_0_7.bob b/99-Shared/mrfioc2_new/_pulsers_0_7.bob
index d929e22ce5a7e624535e40208ea0c5f690cb4816..d2745918d812487b112c5367f977f47cce5e20d2 100644
--- a/99-Shared/mrfioc2_new/_pulsers_0_7.bob
+++ b/99-Shared/mrfioc2_new/_pulsers_0_7.bob
@@ -40,7 +40,7 @@
       <name>Embedded 0_4</name>
       <macros>
         <N>0</N>
-        <Q>DlyGen0</Q>
+        <Q>DlyGen-0</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>40</y>
@@ -86,7 +86,7 @@
       <name>Embedded 1_4</name>
       <macros>
         <N>1</N>
-        <Q>DlyGen1</Q>
+        <Q>DlyGen-1</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>105</y>
@@ -132,7 +132,7 @@
       <name>Embedded 2_4</name>
       <macros>
         <N>2</N>
-        <Q>DlyGen2</Q>
+        <Q>DlyGen-2</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>174</y>
@@ -178,7 +178,7 @@
       <name>Embedded 3_4</name>
       <macros>
         <N>3</N>
-        <Q>DlyGen3</Q>
+        <Q>DlyGen-3</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>241</y>
@@ -224,7 +224,7 @@
       <name>Embedded 4_4</name>
       <macros>
         <N>4</N>
-        <Q>DlyGen4</Q>
+        <Q>DlyGen-4</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>308</y>
@@ -270,7 +270,7 @@
       <name>Embedded 5_4</name>
       <macros>
         <N>5</N>
-        <Q>DlyGen5</Q>
+        <Q>DlyGen-5</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>375</y>
@@ -316,7 +316,7 @@
       <name>Embedded 6_4</name>
       <macros>
         <N>6</N>
-        <Q>DlyGen6</Q>
+        <Q>DlyGen-6</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>442</y>
@@ -358,7 +358,7 @@
       <name>Embedded 7_4</name>
       <macros>
         <N>7</N>
-        <Q>DlyGen7</Q>
+        <Q>DlyGen-7</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>508</y>
diff --git a/99-Shared/mrfioc2_new/_pulsers_8_15.bob b/99-Shared/mrfioc2_new/_pulsers_8_15.bob
index de53dd7b58d5177d603344e645d31cdcd28bbb3d..9b1c38bf989d3c7dd8fdb2fb02c0ad4400c349b1 100644
--- a/99-Shared/mrfioc2_new/_pulsers_8_15.bob
+++ b/99-Shared/mrfioc2_new/_pulsers_8_15.bob
@@ -123,7 +123,7 @@
       <name>Embedded 0_3</name>
       <macros>
         <N>8</N>
-        <Q>DlyGen8</Q>
+        <Q>DlyGen-8</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>40</y>
@@ -139,7 +139,7 @@
       <name>Embedded 1_3</name>
       <macros>
         <N>9</N>
-        <Q>DlyGen9</Q>
+        <Q>DlyGen-9</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>107</y>
@@ -155,7 +155,7 @@
       <name>Embedded 2_3</name>
       <macros>
         <N>10</N>
-        <Q>DlyGen10</Q>
+        <Q>DlyGen-10</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>174</y>
@@ -171,7 +171,7 @@
       <name>Embedded 3_3</name>
       <macros>
         <N>11</N>
-        <Q>DlyGen11</Q>
+        <Q>DlyGen-11</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>241</y>
@@ -187,7 +187,7 @@
       <name>Embedded 4_3</name>
       <macros>
         <N>12</N>
-        <Q>DlyGen12</Q>
+        <Q>DlyGen-12</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>308</y>
@@ -203,7 +203,7 @@
       <name>Embedded 5_3</name>
       <macros>
         <N>13</N>
-        <Q>DlyGen13</Q>
+        <Q>DlyGen-13</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>375</y>
@@ -219,7 +219,7 @@
       <name>Embedded 6_3</name>
       <macros>
         <N>14</N>
-        <Q>DlyGen14</Q>
+        <Q>DlyGen-14</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>442</y>
@@ -231,7 +231,7 @@
       <name>Embedded 7_3</name>
       <macros>
         <N>15</N>
-        <Q>DlyGen15</Q>
+        <Q>DlyGen-15</Q>
       </macros>
       <file>_evrdlygen.bob</file>
       <y>509</y>
diff --git a/99-Shared/mrfioc2_new/_ts_array.bob b/99-Shared/mrfioc2_new/_ts_array.bob
index e096f4eb42522aacd4e2f34ada31d60f42043e15..fc23f5aadf6c53e520a3e02ba022dc70751d6018 100644
--- a/99-Shared/mrfioc2_new/_ts_array.bob
+++ b/99-Shared/mrfioc2_new/_ts_array.bob
@@ -4,39 +4,7 @@
   <width>530</width>
   <height>690</height>
   <widget type="array" version="2.0.0">
-    <name>Array</name>
-    <pv_name>$(P)$(R)$(SS)-Timestamp-SP</pv_name>
-    <x>30</x>
-    <width>130</width>
-    <height>680</height>
-    <foreground_color>
-      <color red="121" green="121" blue="121" alpha="0">
-      </color>
-    </foreground_color>
-    <widget type="textupdate" version="2.0.0">
-      <name>Text Update</name>
-      <width>110</width>
-      <height>22</height>
-      <font>
-        <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
-        </font>
-      </font>
-      <background_color>
-        <color name="Write_Background" red="224" green="217" blue="202">
-        </color>
-      </background_color>
-      <format>1</format>
-      <precision>6</precision>
-      <horizontal_alignment>2</horizontal_alignment>
-      <border_width>2</border_width>
-      <border_color>
-        <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
-        </color>
-      </border_color>
-    </widget>
-  </widget>
-  <widget type="array" version="2.0.0">
-    <name>Array_2</name>
+    <name>TimestampRB</name>
     <pv_name>$(P)$(R)$(SS)-Timestamp-RB</pv_name>
     <x>170</x>
     <width>130</width>
@@ -64,16 +32,16 @@
     </widget>
   </widget>
   <widget type="array" version="2.0.0">
-    <name>Array_1</name>
+    <name>EvtCodeSP</name>
     <pv_name>$(P)$(R)$(SS)-EvtCode-SP</pv_name>
-    <x>350</x>
+    <x>360</x>
     <width>80</width>
     <height>680</height>
     <foreground_color>
       <color red="121" green="121" blue="121" alpha="0">
       </color>
     </foreground_color>
-    <widget type="textupdate" version="2.0.0">
+    <widget type="textentry" version="3.0.0">
       <name>Text Update_1</name>
       <width>60</width>
       <height>22</height>
@@ -81,13 +49,9 @@
         <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
         </font>
       </font>
-      <background_color>
-        <color name="Write_Background" red="224" green="217" blue="202">
-        </color>
-      </background_color>
       <format>1</format>
       <precision>0</precision>
-      <horizontal_alignment>2</horizontal_alignment>
+      <wrap_words>true</wrap_words>
       <border_width>2</border_width>
       <border_color>
         <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -96,7 +60,7 @@
     </widget>
   </widget>
   <widget type="array" version="2.0.0">
-    <name>Array_3</name>
+    <name>EvtCodeRB</name>
     <pv_name>$(P)$(R)$(SS)-EvtCode-RB</pv_name>
     <x>440</x>
     <width>80</width>
@@ -871,4 +835,20 @@
     </font>
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
+  <widget type="array" version="2.0.0">
+    <name>Array_4</name>
+    <pv_name>$(P)$(R)$(SS)-Timestamp-SP</pv_name>
+    <x>40</x>
+    <width>130</width>
+    <height>680</height>
+    <foreground_color>
+      <color red="255" green="255" blue="255" alpha="0">
+      </color>
+    </foreground_color>
+    <widget type="textentry" version="3.0.0">
+      <name>Text Entry</name>
+      <width>110</width>
+      <height>22</height>
+    </widget>
+  </widget>
 </display>
diff --git a/99-Shared/mrfioc2_new/evr-expert.bob b/99-Shared/mrfioc2_new/evr-expert.bob
index bcb9b67b4b16194fa04fa227a3f045f1e7dfb3ca..c04fcdfd1da0e08a3337f573089863ba41c0c7c5 100644
--- a/99-Shared/mrfioc2_new/evr-expert.bob
+++ b/99-Shared/mrfioc2_new/evr-expert.bob
@@ -1691,7 +1691,7 @@
           <name>Soft 0</name>
           <file>_sequencer.bob</file>
           <macros>
-            <SS>SoftSeq0</SS>
+            <SS>SoftSeq-0</SS>
           </macros>
           <group_name></group_name>
         </tab>
@@ -1699,7 +1699,7 @@
           <name>Soft 1</name>
           <file>_sequencer.bob</file>
           <macros>
-            <SS>SoftSeq1</SS>
+            <SS>SoftSeq-1</SS>
           </macros>
           <group_name></group_name>
         </tab>
@@ -1707,7 +1707,7 @@
           <name>Soft 2</name>
           <file>_sequencer.bob</file>
           <macros>
-            <SS>SoftSeq2</SS>
+            <SS>SoftSeq-2</SS>
           </macros>
           <group_name></group_name>
         </tab>
diff --git a/99-Shared/mrfioc2_new/evr-mtca-300u.bob b/99-Shared/mrfioc2_new/evr-mtca-300u.bob
index 9071aba931ca8f2a0160d36aa0c368744b8aadf0..7524e09373b5dca5f52838c15c74cb1d131e7929 100644
--- a/99-Shared/mrfioc2_new/evr-mtca-300u.bob
+++ b/99-Shared/mrfioc2_new/evr-mtca-300u.bob
@@ -308,7 +308,7 @@
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_24</name>
       <macros>
-        <Q>In0</Q>
+        <Q>In-0</Q>
       </macros>
       <file>_evrinput.bob</file>
       <x>28</x>
@@ -321,7 +321,7 @@
     <widget type="embedded" version="2.0.0">
       <name>Embedded Display_25</name>
       <macros>
-        <Q>In1</Q>
+        <Q>In-1</Q>
       </macros>
       <file>_evrinput.bob</file>
       <x>28</x>
@@ -475,7 +475,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_21</name>
-      <pv_name>$(P)$(R)PS2-Rate-I</pv_name>
+      <pv_name>$(P)$(R)PS-2-Rate-I</pv_name>
       <x>164</x>
       <y>154</y>
       <width>90</width>
@@ -492,7 +492,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_22</name>
-      <pv_name>$(P)$(R)PS1-Rate-I</pv_name>
+      <pv_name>$(P)$(R)PS-1-Rate-I</pv_name>
       <x>164</x>
       <y>120</y>
       <width>90</width>
@@ -509,7 +509,7 @@
     </widget>
     <widget type="textupdate" version="2.0.0">
       <name>Text Update_23</name>
-      <pv_name>$(P)$(R)PS0-Rate-I</pv_name>
+      <pv_name>$(P)$(R)PS-0-Rate-I</pv_name>
       <x>164</x>
       <y>86</y>
       <width>90</width>
@@ -526,7 +526,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text Input_4</name>
-      <pv_name>$(P)$(R)PS0-Div-SP</pv_name>
+      <pv_name>$(P)$(R)PS-0-Div-SP</pv_name>
       <x>58</x>
       <y>86</y>
       <width>78</width>
@@ -544,7 +544,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text Input_5</name>
-      <pv_name>$(P)$(R)PS1-Div-SP</pv_name>
+      <pv_name>$(P)$(R)PS-1-Div-SP</pv_name>
       <x>58</x>
       <y>120</y>
       <width>78</width>
@@ -562,7 +562,7 @@
     </widget>
     <widget type="textentry" version="3.0.0">
       <name>Text Input_6</name>
-      <pv_name>$(P)$(R)PS2-Div-SP</pv_name>
+      <pv_name>$(P)$(R)PS-2-Div-SP</pv_name>
       <x>58</x>
       <y>154</y>
       <width>78</width>
@@ -1070,42 +1070,42 @@
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_11</name>
-      <pv_name>$(P)$(R)SoftSeq2-Enable-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-2-Enable-RB</pv_name>
       <x>107</x>
       <y>152</y>
       <square>true</square>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_12</name>
-      <pv_name>$(P)$(R)SoftSeq2-Load-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-2-Load-RB</pv_name>
       <x>50</x>
       <y>152</y>
       <square>true</square>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_9</name>
-      <pv_name>$(P)$(R)SoftSeq1-Enable-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-1-Enable-RB</pv_name>
       <x>107</x>
       <y>118</y>
       <square>true</square>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_10</name>
-      <pv_name>$(P)$(R)SoftSeq1-Load-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-1-Load-RB</pv_name>
       <x>50</x>
       <y>118</y>
       <square>true</square>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_7</name>
-      <pv_name>$(P)$(R)SoftSeq0-Enable-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-0-Enable-RB</pv_name>
       <x>107</x>
       <y>84</y>
       <square>true</square>
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED_8</name>
-      <pv_name>$(P)$(R)SoftSeq0-Load-RB</pv_name>
+      <pv_name>$(P)$(R)SoftSeq-0-Load-RB</pv_name>
       <x>50</x>
       <y>84</y>
       <square>true</square>
diff --git a/99-Shared/mrfioc2_new/legacy/_evrdlygen_backup1.bob b/99-Shared/mrfioc2_new/legacy/_evrdlygen_backup1.bob
deleted file mode 100644
index 787a06eca21d08b100ff8470e2db1d48c7b2b995..0000000000000000000000000000000000000000
--- a/99-Shared/mrfioc2_new/legacy/_evrdlygen_backup1.bob
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
-  <name>EVR DlyGen</name>
-  <width>675</width>
-  <height>50</height>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle_1</name>
-    <x>530</x>
-    <y>22</y>
-    <width>20</width>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <corner_width>3</corner_width>
-    <corner_height>3</corner_height>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>Rectangle</name>
-    <x>430</x>
-    <y>22</y>
-    <width>20</width>
-    <line_width>0</line_width>
-    <background_color>
-      <color name="Read_Background" red="230" green="235" blue="232">
-      </color>
-    </background_color>
-    <corner_width>3</corner_width>
-    <corner_height>3</corner_height>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input</name>
-    <pv_name>$(P)$(R)$(Q)-Prescaler-SP</pv_name>
-    <x>300</x>
-    <y>22</y>
-    <width>50</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_1</name>
-    <pv_name>$(P)$(R)$(Q)-Delay-SP</pv_name>
-    <x>365</x>
-    <y>22</y>
-    <width>65</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_2</name>
-    <pv_name>$(P)$(R)$(Q)-Width-SP</pv_name>
-    <x>465</x>
-    <y>22</y>
-    <width>65</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label</name>
-    <text>$(N)</text>
-    <x>9</x>
-    <y>19</y>
-    <width>25</width>
-    <font>
-      <font family="Source Sans Pro Semibold" style="REGULAR" size="16.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color name="TEXT" red="25" green="25" blue="25">
-      </color>
-    </foreground_color>
-    <background_color>
-      <color red="255" green="255" blue="255">
-      </color>
-    </background_color>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <actions>
-    </actions>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_3</name>
-    <pv_name>$(P)$(R)$(Q)-Evt-Trig0-SP</pv_name>
-    <x>565</x>
-    <y>22</y>
-    <width>30</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_4</name>
-    <pv_name>$(P)$(R)$(Q)-Evt-Trig1-SP</pv_name>
-    <x>600</x>
-    <y>22</y>
-    <width>30</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_5</name>
-    <pv_name>$(P)$(R)$(Q)-Evt-Trig2-SP</pv_name>
-    <x>635</x>
-    <y>22</y>
-    <width>30</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <show_units>false</show_units>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="bool_button" version="2.0.0">
-    <name>Boolean Button</name>
-    <pv_name>$(P)$(R)$(Q)-Polarity-Sel</pv_name>
-    <bit>-1</bit>
-    <x>100</x>
-    <y>22</y>
-    <width>65</width>
-    <height>20</height>
-    <off_label>Normal</off_label>
-    <off_color>
-      <color name="Button_Background" red="236" green="236" blue="236">
-      </color>
-    </off_color>
-    <on_label>Invert</on_label>
-    <on_color>
-      <color name="RED-BACKGROUND" red="225" green="192" blue="188">
-      </color>
-    </on_color>
-    <show_led>false</show_led>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="bool_button" version="2.0.0">
-    <name>Boolean Button_1</name>
-    <pv_name>$(P)$(R)$(Q)-Ena-Sel</pv_name>
-    <bit>-1</bit>
-    <x>40</x>
-    <y>22</y>
-    <width>50</width>
-    <height>20</height>
-    <off_color>
-      <color name="OFF" red="90" green="110" blue="90">
-      </color>
-    </off_color>
-    <on_color>
-      <color name="ON" red="70" green="255" blue="70">
-      </color>
-    </on_color>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <foreground_color>
-      <color red="0" green="0" blue="0">
-      </color>
-    </foreground_color>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textentry" version="3.0.0">
-    <name>Text Input_6</name>
-    <pv_name>$(P)$(R)$(Q)-Label-I</pv_name>
-    <x>180</x>
-    <y>22</y>
-    <width>105</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <format>6</format>
-    <actions>
-    </actions>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-    <border_color>
-      <color red="0" green="128" blue="255">
-      </color>
-    </border_color>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_2</name>
-    <pv_name>$(P)$(R)$(Q)-Width-SP.EGU</pv_name>
-    <x>530</x>
-    <y>22</y>
-    <width>20</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <transparent>true</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="textupdate" version="2.0.0">
-    <name>Text Update_3</name>
-    <pv_name>$(P)$(R)$(Q)-Delay-SP.EGU</pv_name>
-    <x>430</x>
-    <y>22</y>
-    <width>20</width>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="14.0">
-      </font>
-    </font>
-    <transparent>true</transparent>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-    <border_alarm_sensitive>false</border_alarm_sensitive>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_2</name>
-    <text>Polarity</text>
-    <x>100</x>
-    <y>4</y>
-    <width>65</width>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-    <horizontal_alignment>1</horizontal_alignment>
-    <vertical_alignment>1</vertical_alignment>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_3</name>
-    <text>Label</text>
-    <x>180</x>
-    <y>4</y>
-    <width>105</width>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_4</name>
-    <text>Prescaler</text>
-    <x>300</x>
-    <y>4</y>
-    <width>50</width>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_5</name>
-    <text>Delay</text>
-    <x>365</x>
-    <y>4</y>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_6</name>
-    <text>Width</text>
-    <x>465</x>
-    <y>4</y>
-    <width>110</width>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>Label_7</name>
-    <text>Trigger Events</text>
-    <x>565</x>
-    <y>4</y>
-    <width>92</width>
-    <height>15</height>
-    <font>
-      <font family="Source Sans Pro" style="REGULAR" size="12.0">
-      </font>
-    </font>
-  </widget>
-</display>
diff --git a/99-Shared/mrfioc2_new/legacy/mtca-evr-frontpanel.jpg b/99-Shared/mrfioc2_new/legacy/mtca-evr-frontpanel.jpg
deleted file mode 100644
index 83ac053aba37eb4b8543ab93e68ba505dd1e1688..0000000000000000000000000000000000000000
Binary files a/99-Shared/mrfioc2_new/legacy/mtca-evr-frontpanel.jpg and /dev/null differ