diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob
index 4b92544b94a75bbb2080b1c5225b7c2fc8e386cc..c43d0975b7bb3e811ef797a3932a094eacf502d6 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/OverviewScreens/0_Overview.bob
@@ -2,9 +2,9 @@
<display version="2.0.0">
<name>mainOverview</name>
<macros>
- <BCMfile>./EmbedddedWindows/em_BCM_rr.bob</BCMfile>
+ <BCMfile>../EmbeddedScreens/Beam/em_BCM_rr.bob</BCMfile>
<BeamPermit>loc://beampermit</BeamPermit>
- <RFpowerFile>./EmbedddedWindows/em_rf_rr_less.bob</RFpowerFile>
+ <RFpowerFile>../EmbeddedScreens/Cavities/em_rf_rr_less.bob</RFpowerFile>
<SystemPermit>loc://systempermit</SystemPermit>
</macros>
<width>2350</width>
@@ -291,7 +291,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_17</name>
- <file>EmbedddedWindows/em_SL_OPI_operations.bob</file>
+ <file>../EmbeddedScreens/Other/em_SL_OPI_operations.bob</file>
<x>1390</x>
<y>720</y>
<width>460</width>
@@ -438,7 +438,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_18</name>
- <file>EmbedddedWindows/em_SL_OPI_TS2.bob</file>
+ <file>../EmbeddedScreens/Other/em_SL_OPI_TS2.bob</file>
<x>1870</x>
<y>720</y>
<width>460</width>
@@ -446,7 +446,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Embedded Display_19</name>
- <file>EmbedddedWindows/em_Beam-and-Systems-Permit.bob</file>
+ <file>../EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob</file>
<x>1370</x>
<width>450</width>
<height>430</height>
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob
index c104ef7661307f4d4c500d1ae0649d5a20d6466f..07cc19fdb416ff8640339557e368192b6e040071 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubScreens/DetailedScreens/BCM.bob
@@ -59,8 +59,8 @@ $(pv_value)</tooltip>
<widget type="group" version="2.0.0">
<name>Config</name>
<x>20</x>
- <y>77</y>
- <width>475</width>
+ <y>70</y>
+ <width>480</width>
<height>793</height>
<style>3</style>
<background_color>
@@ -69,7 +69,7 @@ $(pv_value)</tooltip>
</background_color>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar</name>
- <width>475</width>
+ <width>480</width>
<height>793</height>
<line_width>0</line_width>
<background_color>
@@ -82,8 +82,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>BGGrey03-title</name>
<text>Settings</text>
- <x>14</x>
- <width>246</width>
+ <width>480</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
@@ -93,19 +92,20 @@ $(pv_value)</tooltip>
<color name="TEXT-LIGHT" red="230" green="230" blue="230">
</color>
</foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="group" version="2.0.0">
<name>BGGrey03-content-group</name>
- <x>14</x>
+ <x>20</x>
<y>50</y>
- <width>446</width>
+ <width>440</width>
<height>723</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background</name>
- <width>446</width>
+ <width>440</width>
<height>723</height>
<line_width>0</line_width>
<background_color>
@@ -117,9 +117,9 @@ $(pv_value)</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>LGGrey02</name>
- <x>15</x>
+ <x>20</x>
<y>20</y>
- <width>416</width>
+ <width>400</width>
<height>686</height>
<style>3</style>
<widget type="label" version="2.0.0">
@@ -147,7 +147,7 @@ $(pv_value)</tooltip>
<name>Hardware</name>
<x>10</x>
<y>50</y>
- <width>396</width>
+ <width>380</width>
<height>150</height>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
@@ -212,7 +212,7 @@ $(pv_value)</tooltip>
<name>Pulse</name>
<x>10</x>
<y>220</y>
- <width>396</width>
+ <width>380</width>
<height>100</height>
<transparent>true</transparent>
<widget type="spinner" version="2.0.0">
@@ -250,7 +250,7 @@ $(pv_value)</tooltip>
<name>Setup</name>
<x>10</x>
<y>350</y>
- <width>396</width>
+ <width>380</width>
<height>160</height>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
@@ -315,7 +315,7 @@ $(pv_value)</tooltip>
<name>Parameters</name>
<x>10</x>
<y>530</y>
- <width>396</width>
+ <width>380</width>
<height>130</height>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
@@ -366,9 +366,9 @@ $(pv_value)</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>Signal</name>
- <x>510</x>
- <y>77</y>
- <width>1015</width>
+ <x>520</x>
+ <y>70</y>
+ <width>1020</width>
<height>793</height>
<style>3</style>
<background_color>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/TS2_powerdistribution_4klystrons.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/TS2_powerdistribution_4klystrons.bob
index 52f1e36df684af8433f0b5af488b1e68da58cc7e..fb3a68beb1cfc7e6bf98fe445bf0fc4f4ec99dda 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/TS2_powerdistribution_4klystrons.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/TS2_powerdistribution_4klystrons.bob
@@ -1225,20 +1225,6 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_30</name>
- <text>System 1</text>
- <x>90</x>
- <y>970</y>
- <width>140</width>
- <height>40</height>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="24.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
<widget type="group" version="2.0.0">
<name>DA-Group_1</name>
<x>870</x>
@@ -2482,7 +2468,7 @@
<tooltip></tooltip>
</widget>
<widget type="led" version="2.0.0">
- <name>Rectangle_8</name>
+ <name>Rectangle_45</name>
<pv_name>KG-GTA:PSS-Area-TS2:RFWaveGuide4InPos</pv_name>
<width>40</width>
<height>15</height>
@@ -2502,7 +2488,7 @@
<tooltip></tooltip>
</widget>
<widget type="led" version="2.0.0">
- <name>Rectangle_7</name>
+ <name>Rectangle_46</name>
<pv_name>KG-GTA:PSS-Area-TS2:RFWaveGuide3InPos</pv_name>
<x>60</x>
<width>40</width>