diff --git a/99-Shared/adcore/ADAttrFile.bob b/99-Shared/adcore/ADAttrFile.bob
index 66b2b41dd0c058c859f0557d7c7ae708c73871aa..ff456e7a0f0ad77995bc3bb733e260c7f3ee2792 100644
--- a/99-Shared/adcore/ADAttrFile.bob
+++ b/99-Shared/adcore/ADAttrFile.bob
@@ -4,146 +4,198 @@
   <x>214</x>
   <y>81</y>
   <width>350</width>
-  <height>110</height>
-  <background_color>
-    <color red="187" green="187" blue="187">
-    </color>
-  </background_color>
-  <grid_visible>false</grid_visible>
-  <grid_step_x>5</grid_step_x>
+  <height>120</height>
+  <actions>
+  </actions>
   <widget type="rectangle" version="2.0.0">
-    <name>rectangle #6</name>
-    <x>127</x>
-    <y>2</y>
-    <width>107</width>
-    <height>21</height>
+    <name>BGGrey02-background_1</name>
+    <y>30</y>
+    <width>350</width>
+    <height>90</height>
+    <line_width>2</line_width>
     <line_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
       </color>
     </line_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
       </color>
     </background_color>
+    <corner_height>10</corner_height>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #9</name>
-    <text>Attributes</text>
-    <x>130</x>
-    <y>2</y>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <name>Label</name>
+    <text>File:</text>
+    <x>23</x>
+    <y>40</y>
+    <width>40</width>
     <foreground_color>
-      <color red="10" green="0" blue="184">
-      </color>
-    </foreground_color>
-    <horizontal_alignment>1</horizontal_alignment>
-  </widget>
-  <widget type="rectangle" version="2.0.0">
-    <name>rectangle #12</name>
-    <width>350</width>
-    <height>110</height>
-    <line_width>1</line_width>
-    <line_color>
       <color red="0" green="0" blue="0">
       </color>
-    </line_color>
+    </foreground_color>
     <background_color>
-      <color red="0" green="0" blue="0">
+      <color red="255" green="255" blue="255">
       </color>
     </background_color>
-    <transparent>true</transparent>
-  </widget>
-  <widget type="label" version="2.0.0">
-    <name>text #15</name>
-    <text>File</text>
-    <x>25</x>
-    <y>30</y>
-    <width>40</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #18</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDAttributesFile</pv_name>
     <x>71</x>
-    <y>31</y>
+    <y>40</y>
     <width>275</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #22</name>
-    <text>Macros</text>
+    <name>Label</name>
+    <text>Macros:</text>
     <x>5</x>
-    <y>55</y>
+    <y>64</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textentry" version="3.0.0">
-    <name>text entry #25</name>
+    <name>Text Input</name>
     <pv_name>$(P)$(R)NDAttributesMacros</pv_name>
     <x>70</x>
-    <y>56</y>
+    <y>65</y>
     <width>275</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="115" green="223" blue="255">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <actions>
+    </actions>
     <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #29</name>
-    <text>Status</text>
+    <name>Label</name>
+    <text>Status:</text>
     <x>5</x>
-    <y>80</y>
+    <y>89</y>
     <width>60</width>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
+    <background_color>
+      <color red="255" green="255" blue="255">
+      </color>
+    </background_color>
     <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
   </widget>
   <widget type="textupdate" version="2.0.0">
-    <name>text update #32</name>
+    <name>Text Update</name>
     <pv_name>$(P)$(R)NDAttributesStatus</pv_name>
     <x>70</x>
-    <y>81</y>
+    <y>90</y>
     <width>275</width>
     <height>18</height>
-    <font>
-      <font family="Liberation Sans" style="REGULAR" size="16.0">
-      </font>
-    </font>
+    <foreground_color>
+      <color name="BLACK" red="0" green="0" blue="0">
+      </color>
+    </foreground_color>
     <background_color>
-      <color red="218" green="218" blue="218">
+      <color name="BLACK-TEXT" red="255" green="255" blue="255">
       </color>
     </background_color>
     <format>6</format>
     <show_units>false</show_units>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
+    <actions>
+    </actions>
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
+  <widget type="rectangle" version="2.0.0">
+    <name>Rectangle_5</name>
+    <width>350</width>
+    <height>30</height>
+    <line_width>0</line_width>
+    <background_color>
+      <color name="GROUP-BORDER" red="150" green="155" blue="151">
+      </color>
+    </background_color>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_2</name>
+    <class>GROUP-TITLE</class>
+    <text>Attributes</text>
+    <width>350</width>
+    <height use_class="true">30</height>
+    <font use_class="true">
+      <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+      </font>
+    </font>
+    <foreground_color use_class="true">
+      <color name="GROUP-TEXT" red="25" green="25" blue="25">
+      </color>
+    </foreground_color>
+    <horizontal_alignment use_class="true">1</horizontal_alignment>
+    <vertical_alignment use_class="true">1</vertical_alignment>
+    <wrap_words use_class="true">false</wrap_words>
   </widget>
 </display>