--- video-ui.xml.orig	2018-04-17 14:44:43.827360598 +0000
+++ video-ui.xml	2019-04-21 23:09:21.959330647 +0000
@@ -58,8 +58,8 @@
         <textarea name="label" from="basetextarea">
             <area>10,4,543,70</area>
             <align>allcenter</align>
-            <font>baselargedarkyellow</font>
-            <value>Cast Members</value>
+            <font>baselarge</font>
+            <value>Cast</value>
         </textarea>
 
         <buttonlist name="cast" from="base_button_list">
@@ -98,10 +98,10 @@
                 </state>
             </statetype>
         <statetype name="upscrollarrow">
-            <position>0,368</position>
+            <position>507,368</position>
         </statetype>
         <statetype name="downscrollarrow">
-            <position>20,368</position>
+            <position>527,368</position>
         </statetype>
         </buttonlist>
 
@@ -154,7 +154,7 @@
         </shape>
 
         <shape name="full-plot-seperator-first-line" from="base_line">
-            <area>23,45,517,2</area>
+            <area>23,74,517,2</area>
         </shape>
 
         <shape name="full-plot-seperator-second-line" from="base_line">
@@ -162,15 +162,16 @@
         </shape>
 
         <textarea name="label" from="basetextarea">
-            <area>24,4,515,41</area>
+            <area>10,4,543,70</area>
             <align>allcenter</align>
-            <font>basesmalldarkyellow</font>
-            <value>Full Plot</value>
+            <font>baselarge</font>
+            <value>Plot</value>
         </textarea>
 
         <textarea name="description" from="basetextarea">
-            <area>24,51,515,393</area>
+            <area>24,78,515,358</area>
             <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
             <font>basesmall</font>
         </textarea>
 
@@ -358,38 +359,38 @@
                     </imagetype>
                     <textarea name="title" from="basetextarea">
                         <area>88,1,498,24</area>
-                        <font>basesmall</font>
+                        <font>basesmallyellow</font>
                     </textarea>
                     <textarea name="director" from="title">
                         <area>606,1,536,24</area>                      
                         <cutdown>no</cutdown>
                     </textarea>
                     <textarea name="year" from="title">
-                        <area>1162,2,54,24</area>
+                        <area>1162,1,54,24</area>
                         <cutdown>no</cutdown>
                         <align>right,vcenter</align>
                     </textarea>     
                     <textarea name="rating" from="basetextarea">
-                        <area>88,23,196,20</area>
+                        <area>88,26,196,20</area>
                         <font>baseextrasmallblue</font>
                         <cutdown>no</cutdown>
                         <align>vcenter</align>
                         <template>Rated: %1</template>
                     </textarea>
                     <textarea name="length" from="rating">
-                        <area>305,23,280,20</area>
+                        <area>305,26,280,20</area>
                         <template>Runtime: %1</template>
                     </textarea>
                     <textarea name="season" from="rating">
-                        <area>606,23,216,20</area>
+                        <area>606,26,216,20</area>
                         <template>Season: %1</template>
                     </textarea>
                     <textarea name="episode" from="rating">
-                        <area>843,23,228,20</area>
+                        <area>843,26,228,20</area>
                         <template>Episode: %1</template>
                     </textarea>
                     <textarea name="browseable" from="rating">
-                        <area>1082,23,134,20</area>
+                        <area>1082,26,134,20</area>
                         <align>right,vcenter</align>
                         <template>Browseable: %1</template>
                     </textarea>
@@ -641,7 +642,7 @@
             <multiline>yes</multiline>
             <font>basesmall</font>
             <align>allcenter</align>
-            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
+            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
         </textarea>
 
         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -876,13 +877,6 @@
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="lvllbl" from="basetextarea">
-            <area>1038,411,158,40</area>
-            <font>basesmall</font>
-            <value>Parental Level:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
         <statetype name="videolevel">
             <area>1206,416,30,30</area>
             <state name="None">
@@ -890,238 +884,273 @@
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_none.png</filename>
                 </imagetype>
+                <textarea name="none">
+                    <area>-165,3,158,24</area>
+                    <font>basesmall</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Lowest">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_lowest.png</filename>
                 </imagetype>
+                <textarea name="lowest">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallgreen</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Low">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_low.png</filename>
                 </imagetype>
+                <textarea name="low">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallyellow</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Medium">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_medium.png</filename>
                 </imagetype>
+                <textarea name="medium">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallorange</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="High">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_high.png</filename>
                 </imagetype>
+                <textarea name="high">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallred</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
         </statetype>
 
         <textarea name="dirlbl" from="basetextarea">
-            <area>44,453,132,40</area>
-            <font>basesmall</font>
+            <area>44,453,122,40</area>
+            <font>basesmallblue</font>
             <align>left,vcenter</align>
-            <value>Directed By:</value>
+            <value>Director:</value>
         </textarea>
 
         <textarea name="director" from="basetextarea">
-            <area>186,453,611,40</area>
-            <font>basesmallblue</font>
+            <area>176,453,621,40</area>
+            <font>basesmall</font>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="userratinglabel" from="basetextarea">
+        <textarea name="lenlbl" from="basetextarea">
             <area>817,453,126,40</area>
+            <font>basesmallblue</font>
+            <value>Runtime:</value>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <textarea name="length" from="basetextarea">
+            <area>953,453,118,40</area>
             <font>basesmall</font>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <textarea name="yrlbl" from="basetextarea">
+            <area>1081,453,60,40</area>
+            <font>basesmallblue</font>
+            <value>Year:</value>
             <align>right,vcenter</align>
-            <value>UserRating:</value>
+        </textarea>
+
+        <textarea name="year" from="basetextarea">
+            <area>1156,453,80,40</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <textarea name="description" from="basetextarea">
+            <area>44,501,1192,130</area>
+            <multiline>yes</multiline>
+            <font>basesmall</font>
+            <align>left,top</align>
+            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
+        </textarea>
+
+        <textarea name="userratinglabel" from="basetextarea">
+            <area>44,633,108,40</area>
+            <font>basesmallblue</font>
+            <align>left,vcenter</align>
+            <value>User Rating:</value>
         </textarea>
 
         <statetype name="userratingstate">
             <state name="0">
                 <textarea name="0">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>0 Stars</value>
                 </textarea>
             </state>
             <state name="1">
                 <textarea name="1">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>1 Star</value>
                 </textarea>
             </state>
             <state name="2">
                 <textarea name="2">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>2 Stars</value>
                 </textarea>
             </state>
             <state name="3">
                 <textarea name="3">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>3 Stars</value>
                 </textarea>
             </state>
             <state name="4">
                 <textarea name="4">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>4 Stars</value>
                 </textarea>
             </state>
             <state name="5">
                 <textarea name="5">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>5 Stars</value>
                 </textarea>
             </state>
             <state name="6">
                 <textarea name="6">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>6 Stars</value>
                 </textarea>
             </state>
             <state name="7">
                 <textarea name="7">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>7 Stars</value>
                 </textarea>
             </state>
             <state name="8">
                 <textarea name="8">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>8 Stars</value>
                 </textarea>
             </state>
             <state name="9">
                 <textarea name="9">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>9 Stars</value>
                 </textarea>
             </state>
             <state name="10">
                 <textarea name="10">
-                    <area>953,453,108,40</area>
-                    <font>basesmallblue</font>
+                    <area>162,633,144,40</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>10 Stars</value>
                 </textarea>
             </state>
         </statetype>
 
-        <textarea name="yrlbl" from="basetextarea">
-            <area>1081,453,60,40</area>
-            <font>basesmall</font>
-            <value>Year:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
-        <textarea name="year" from="basetextarea">
-            <area>1156,453,80,40</area>
-            <font>basesmallblue</font>
-            <align>allcenter</align>
-        </textarea>
-
-        <textarea name="description" from="basetextarea">
-            <area>44,501,1192,130</area>
-            <multiline>yes</multiline>
-            <font>basesmall</font>
-            <align>left,top</align>
-            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
-        </textarea>
-
-        <textarea name="lenlbl" from="basetextarea">
-            <area>44,633,98,40</area>
-            <font>basesmall</font>
-            <value>Runtime:</value>
-            <align>left,vcenter</align>
-        </textarea>
-
-        <textarea name="length" from="basetextarea">
-            <area>152,633,154,40</area>
-            <font>basesmallblue</font>
-            <align>left,vcenter</align>
-        </textarea>
-
         <textarea name="ratlbl" from="basetextarea">
             <area>320,633,70,40</area>
-            <font>basesmall</font>
+            <font>basesmallblue</font>
             <value>Rated:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="rating" from="basetextarea">
             <area>400,633,92,40</area>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="seasonlbl" from="basetextarea">
             <area>506,633,92,40</area>
-            <font>basesmall</font>
+            <font>basesmallblue</font>
             <value>Season:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="season" from="basetextarea">
-            <area>608,633,132,40</area>
-            <font>basesmallblue</font>
+            <area>608,633,92,40</area>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="episodelbl" from="basetextarea">
-            <area>754,633,92,40</area>
-            <font>basesmall</font>
+            <area>714,633,92,40</area>
+            <font>basesmallblue</font>
             <align>right,vcenter</align>
             <value>Episode:</value>
         </textarea>
 
         <textarea name="episode" from="basetextarea">
-            <area>856,633,132,40</area>
-            <font>basesmallblue</font>
+            <area>816,633,92,40</area>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="inetlbl" from="basetextarea">
-            <area>1002,633,92,40</area>
-            <font>basesmall</font>
+            <area>922,633,92,40</area>
+            <font>basesmallblue</font>
             <align>right,vcenter</align>
             <value>Video #:</value>
         </textarea>
 
         <textarea name="inetref" from="basetextarea">
-            <area>1104,633,132,40</area>
-            <font>basesmallblue</font>
+            <area>1024,633,212,40</area>
+            <font>basesmall</font>
             <cutdown>no</cutdown>
             <align>allcenter</align>
         </textarea>
@@ -1131,7 +1160,7 @@
             <multiline>yes</multiline>
             <font>basesmall</font>
             <align>allcenter</align>
-            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
         </textarea>
         
         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1369,14 +1398,14 @@
             <font>basemediumlargeryellow</font>
             <align>left,vcenter</align>
         </textarea>
-
+<!--
         <textarea name="lvllbl" from="basetextarea">
             <area>1038,412,158,34</area>
             <font>basesmall</font>
             <value>Parental Level:</value>
             <align>right,vcenter</align>
         </textarea>
-
+-->
         <statetype name="videolevel">
             <area>1206,414,30,30</area>
             <state name="None">
@@ -1384,238 +1413,273 @@
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_none.png</filename>
                 </imagetype>
+                <textarea name="none">
+                    <area>-165,3,158,24</area>
+                    <font>basesmall</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Lowest">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_lowest.png</filename>
                 </imagetype>
+                <textarea name="lowest">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallgreen</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Low">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_low.png</filename>
                 </imagetype>
+                <textarea name="low">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallyellow</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="Medium">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_medium.png</filename>
                 </imagetype>
+                <textarea name="medium">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallorange</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
             <state name="High">
                 <imagetype name="icon">
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_high.png</filename>
                 </imagetype>
+                <textarea name="high">
+                    <area>-165,3,158,24</area>
+                    <font>basesmallred</font>
+                    <cutdown>no</cutdown>
+                    <align>right,vcenter</align>
+                    <value>Parental Level</value>
+                </textarea>
             </state>
         </statetype>
 
         <textarea name="dirlbl" from="basetextarea">
-            <area>44,448,132,34</area>
-            <font>basesmall</font>
+            <area>44,448,122,34</area>
+            <font>basesmallblue</font>
             <align>left,vcenter</align>
-            <value>Directed By:</value>
+            <value>Director:</value>
         </textarea>
 
         <textarea name="director" from="basetextarea">
-            <area>186,448,621,34</area>
-            <font>basesmallblue</font>
+            <area>176,448,631,34</area>
+            <font>basesmall</font>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="userratinglabel" from="basetextarea">
+        <textarea name="lenlbl" from="basetextarea">
             <area>817,448,126,34</area>
+            <font>basesmallblue</font>
+            <value>Runtime:</value>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <textarea name="length" from="basetextarea">
+            <area>953,448,118,34</area>
             <font>basesmall</font>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <textarea name="yrlbl" from="basetextarea">
+            <area>1081,448,60,34</area>
+            <font>basesmallblue</font>
+            <value>Year:</value>
             <align>right,vcenter</align>
-            <value>UserRating:</value>
+        </textarea>
+
+        <textarea name="year" from="basetextarea">
+            <area>1156,448,80,34</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <textarea name="description" from="basetextarea">
+            <area>44,488,1192,148</area>
+            <multiline>yes</multiline>
+            <font>basesmall</font>
+            <align>left</align>
+            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
+        </textarea>
+
+        <textarea name="userratinglabel" from="basetextarea">
+            <area>44,641,108,34</area>
+            <font>basesmallblue</font>
+            <align>left,vcenter</align>
+            <value>User Rating:</value>
         </textarea>
 
         <statetype name="userratingstate">
             <state name="0">
                 <textarea name="0">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>0 Stars</value>
                 </textarea>
             </state>
             <state name="1">
                 <textarea name="1">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>1 Star</value>
                 </textarea>
             </state>
             <state name="2">
                 <textarea name="2">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>2 Stars</value>
                 </textarea>
             </state>
             <state name="3">
                 <textarea name="3">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>3 Stars</value>
                 </textarea>
             </state>
             <state name="4">
                 <textarea name="4">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>4 Stars</value>
                 </textarea>
             </state>
             <state name="5">
                 <textarea name="5">
-                    <area>953,448,108,44</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>5 Stars</value>
                 </textarea>
             </state>
             <state name="6">
                 <textarea name="6">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>6 Stars</value>
                 </textarea>
             </state>
             <state name="7">
                 <textarea name="7">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>7 Stars</value>
                 </textarea>
             </state>
             <state name="8">
                 <textarea name="8">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>8 Stars</value>
                 </textarea>
             </state>
             <state name="9">
                 <textarea name="9">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>9 Stars</value>
                 </textarea>
             </state>
             <state name="10">
                 <textarea name="10">
-                    <area>953,448,108,34</area>
-                    <font>basesmallblue</font>
+                    <area>155,641,155,34</area>
+                    <font>basesmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>10 Stars</value>
                 </textarea>
             </state>
         </statetype>
 
-        <textarea name="yrlbl" from="basetextarea">
-            <area>1081,448,60,34</area>
-            <font>basesmall</font>
-            <value>Year:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
-        <textarea name="year" from="basetextarea">
-            <area>1156,448,80,34</area>
-            <font>basesmallblue</font>
-            <align>allcenter</align>
-        </textarea>
-
-        <textarea name="description" from="basetextarea">
-            <area>44,488,1192,148</area>
-            <multiline>yes</multiline>
-            <font>basesmall</font>
-            <align>left</align>
-            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
-        </textarea>
-
-        <textarea name="lenlbl" from="basetextarea">
-            <area>44,641,98,34</area>
-            <font>basesmall</font>
-            <value>Runtime:</value>
-            <align>left,vcenter</align>
-        </textarea>
-
-        <textarea name="length" from="basetextarea">
-            <area>155,641,155,34</area>
-            <font>basesmallblue</font>
-            <align>left,vcenter</align>
-        </textarea>
-
         <textarea name="ratlbl" from="basetextarea">
             <area>320,641,70,34</area>
-            <font>basesmall</font>
+            <font>basesmallblue</font>
             <value>Rated:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="rating" from="basetextarea">
             <area>403,641,92,34</area>
-            <font>basesmallblue</font>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="seasonlbl" from="basetextarea">
             <area>505,641,92,34</area>
-            <font>basesmall</font>
+            <font>basesmallblue</font>
             <value>Season:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="season" from="basetextarea">
-            <area>610,641,132,34</area>
-            <font>basesmallblue</font>
+            <area>610,641,92,34</area>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="episodelbl" from="basetextarea">
-            <area>752,641,92,34</area>
-            <font>basesmall</font>
+            <area>712,641,92,34</area>
+            <font>basesmallblue</font>
             <align>right,vcenter</align>
             <value>Episode:</value>
         </textarea>
 
         <textarea name="episode" from="basetextarea">
-            <area>857,641,132,34</area>
-            <font>basesmallblue</font>
+            <area>817,641,92,34</area>
+            <font>basesmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="inetlbl" from="basetextarea">
-            <area>999,641,92,34</area>
-            <font>basesmall</font>
+            <area>919,641,92,34</area>
+            <font>basesmallblue</font>
             <align>right,vcenter</align>
             <value>Video #:</value>
         </textarea>
 
         <textarea name="inetref" from="basetextarea">
-            <area>1104,641,132,34</area>
-            <font>basesmallblue</font>
+            <area>1024,641,212,34</area>
+            <font>basesmall</font>
             <cutdown>no</cutdown>
             <align>allcenter</align>
         </textarea>
@@ -1625,7 +1689,7 @@
             <multiline>yes</multiline>
             <font>basesmall</font>
             <align>allcenter</align>
-            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
+            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
         </textarea>
 
         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -1798,21 +1862,21 @@
         
         <textarea name="title" from="basetextarea">
             <area>40,402,553,42</area>
-            <cutdown>yes</cutdown>
+            <scroll direction="left" rate="80" startdelay="2"/> 
             <font>basemediumyellow</font>
             <align>vcenter</align>
         </textarea>
 
         <textarea name="positionlabel" from="basetextarea">
             <area>603,402,95,42</area>
-            <font>basesmall</font>
+            <font>basesmallblue</font>
             <align>left,vcenter</align>
             <value>Position:</value>
         </textarea>
 
         <textarea name="position" from="basetextarea">
             <area>707,404,130,40</area>
-            <font>basesmallerblue</font>
+            <font>basesmall</font>
             <align>left,vcenter</align>
         </textarea>
 
@@ -1875,7 +1939,7 @@
                     <area>0,0,30,30</area>
                     <filename>images/mv_level_high.png</filename>
                 </imagetype>
-                <textarea name="lowest">
+                <textarea name="high">
                     <area>-165,3,158,24</area>
                     <font>basesmallred</font>
                     <cutdown>no</cutdown>
@@ -1886,211 +1950,211 @@
         </statetype>
         
         <textarea name="dirlbl" from="basetextarea">
-            <area>40,444,132,42</area>
-            <font>basesmall</font>
+            <area>40,444,102,42</area>
+            <font>basesmallblue</font>
             <align>left,vcenter</align>
-            <value>Directed By:</value>
+            <value>Director:</value>
         </textarea>
 
         <textarea name="director" from="basetextarea">
-            <area>187,444,407,42</area>
+            <area>152,444,441,42</area>
+            <font>basesmall</font>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <textarea name="lenlbl" from="basetextarea">
+            <area>603,444,95,42</area>
             <font>basesmallblue</font>
+            <value>Runtime:</value>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="userratinglabel" from="basetextarea">
-            <area>604,444,124,42</area>
+        <textarea name="length" from="basetextarea">
+            <area>707,444,139,42</area>
             <font>basesmall</font>
             <align>left,vcenter</align>
-            <value>UserRating:</value>
+        </textarea>
+
+        <textarea name="yrlbl" from="basetextarea">
+            <area>893,444,60,42</area>
+            <font>basesmallblue</font>
+            <value>Year:</value>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <textarea name="year" from="basetextarea">
+            <area>963,444,78,42</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <textarea name="description" from="basetextarea">
+            <area>40,495,1001,136</area>
+            <font>basesmall</font>
+            <align>justify</align>
+            <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
+            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
+        </textarea>
+
+        <textarea name="userratinglabel" from="basetextarea">
+            <area>40,641,80,42</area>
+            <font>baseextrasmallblue</font>
+            <align>left,vcenter</align>
+            <value>User Rating:</value>
         </textarea>
 
         <statetype name="userratingstate">
             <state name="0">
                 <textarea name="0">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>0 Stars</value>
                 </textarea>
             </state>
             <state name="1">
                 <textarea name="1">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>1 Star</value>
                 </textarea>
             </state>
             <state name="2">
                 <textarea name="2">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>2 Stars</value>
                 </textarea>
             </state>
             <state name="3">
                 <textarea name="3">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>3 Stars</value>
                 </textarea>
             </state>
             <state name="4">
                 <textarea name="4">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>4 Stars</value>
                 </textarea>
             </state>
             <state name="5">
                 <textarea name="5">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>5 Stars</value>
                 </textarea>
             </state>
             <state name="6">
                 <textarea name="6">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>6 Stars</value>
                 </textarea>
             </state>
             <state name="7">
                 <textarea name="7">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>7 Stars</value>
                 </textarea>
             </state>
             <state name="8">
                 <textarea name="8">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>8 Stars</value>
                 </textarea>
             </state>
             <state name="9">
                 <textarea name="9">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>9 Stars</value>
                 </textarea>
             </state>
             <state name="10">
                 <textarea name="10">
-                    <area>738,444,108,42</area>
-                    <font>basesmallblue</font>
+                    <area>128,641,140,42</area>
+                    <font>baseextrasmall</font>
                     <cutdown>no</cutdown>
-                    <align>left,vcenter</align>
+                    <align>allcenter</align>
                     <value>10 Stars</value>
                 </textarea>
             </state>
         </statetype>
-        
-        <textarea name="yrlbl" from="basetextarea">
-            <area>893,444,60,42</area>
-            <font>basesmall</font>
-            <value>Year:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
-        <textarea name="year" from="basetextarea">
-            <area>963,444,78,42</area>
-            <font>basesmallblue</font>
-            <align>allcenter</align>
-        </textarea>
-
-        <textarea name="description" from="basetextarea">
-            <area>40,493,1001,140</area>
-            <font>basesmall</font>
-            <align>justify</align>
-            <multiline>yes</multiline>
-            <cutdown>yes</cutdown>
-            <template>%"|SUBTITLE|" %%"|TAGLINE|" %%DESCRIPTION%</template>
-        </textarea>
-
-        <textarea name="lenlbl" from="basetextarea">
-            <area>40,641,68,42</area>
-            <font>baseextrasmall</font>
-            <value>Runtime:</value>
-            <align>left,vcenter</align>
-        </textarea>
-
-        <textarea name="length" from="basetextarea">
-            <area>118,641,104,42</area>
-            <font>baseextrasmallblue</font>
-            <align>left,vcenter</align>
-        </textarea>
 
         <textarea name="ratlbl" from="basetextarea">
-            <area>276,641,50,42</area>
-            <font>baseextrasmall</font>
+            <area>278,641,80,42</area>
+            <font>baseextrasmallblue</font>
             <align>right,vcenter</align>
             <value>Rated:</value>
         </textarea>
 
         <textarea name="rating" from="basetextarea">
-            <area>336,641,70,42</area>
-            <font>baseextrasmallblue</font>
+            <area>366,641,80,42</area>
+            <font>baseextrasmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="seasonlbl" from="basetextarea">
-            <area>465,641,60,42</area>
-            <font>baseextrasmall</font>
+            <area>456,641,80,42</area>
+            <font>baseextrasmallblue</font>
             <value>Season:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="season" from="basetextarea">
-            <area>535,641,92,42</area>
-            <font>baseextrasmallblue</font>
+            <area>544,641,80,42</area>
+            <font>baseextrasmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="episodelbl" from="basetextarea">
-            <area>673,641,64,42</area>
-            <font>baseextrasmall</font>
+            <area>634,641,80,42</area>
+            <font>baseextrasmallblue</font>
             <align>right,vcenter</align>
             <value>Episode:</value>
         </textarea>
 
         <textarea name="episode" from="basetextarea">
-            <area>747,641,92,42</area>
-            <font>baseextrasmallblue</font>
+            <area>722,641,80,42</area>
+            <font>baseextrasmall</font>
             <align>allcenter</align>
         </textarea>
 
         <textarea name="inetlbl" from="basetextarea">
-            <area>879,641,60,42</area>
-            <font>baseextrasmall</font>
+            <area>812,641,80,42</area>
+            <font>baseextrasmallblue</font>
             <align>right,vcenter</align>
-            <value>Video#:</value>
+            <value>Video #:</value>
         </textarea>
 
         <textarea name="inetref" from="basetextarea">
-            <area>949,641,92,42</area>
-            <font>baseextrasmallblue</font>
+            <area>900,641,140,42</area>
+            <font>baseextrasmall</font>
             <cutdown>no</cutdown>
             <align>allcenter</align>
         </textarea>
@@ -2120,7 +2184,7 @@
             <multiline>yes</multiline>
             <font>basesmall</font>
             <align>allcenter</align>
-            <value>No videos in library, or no files found.  If you have configured a video directory, press "M" (or the MENU key) and select "Scan for Change."</value>
+            <value>No videos available. If you have configured a video storage group or directory, press "M" (or the MENU key) and select "Scan for Changes."</value>
         </textarea>
 
         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
@@ -2205,40 +2269,40 @@
         </textedit>
         
         <textarea name="default_text" from="basetextarea">
-            <area>560,320,280,30</area>
-            <value>Use default player</value>
-            <align>vcenter</align>
+            <area>238,320,192,30</area>
+            <value>Use Default Player:</value>
+            <align>right,vcenter</align>
         </textarea>
 
         <checkbox name="default_check" from="base_checkbox">
-            <position>520,320</position>
+            <position>435,320</position>
         </checkbox>
         
         <textarea name="ignore_text" from="basetextarea">
-            <area>560,417,100,30</area>
+            <area>238,417,192,30</area>
             <value>Ignore:</value>
-            <align>vcenter</align>
+            <align>right,vcenter</align>
         </textarea>
 
         <checkbox name="ignore_check" from="base_checkbox">
-            <position>520,417</position>
+            <position>435,417</position>
         </checkbox>
         
-        <button name="done_button" from="base_button">
+        <button name="delete_button" from="base_button">
             <area>320,624,150,35</area>
-            <value>Done</value>
+            <value>Delete</value>
         </button>
-        
+
         <button name="new_button" from="base_button">
             <area>565,624,150,35</area>
             <value>New</value>
         </button>
         
-        <button name="delete_button" from="base_button">
+        <button name="done_button" from="base_button">
             <area>810,624,150,35</area>
-            <value>Delete</value>
+            <value>Done</value>
         </button>
-        
+                
     </window>
     
     <window name="edit_metadata">
@@ -2247,7 +2311,7 @@
         <group name="fanart-group" from="base_fanart_group" />
 
         <textarea name="heading" from="base_heading">
-            <value>Metadata Editor</value>
+            <value>Edit Details</value>
         </textarea>
 
         <shape name="video-metadata-top-backdrop" from="base_backdrop">
@@ -2345,15 +2409,15 @@
             <mask>images/masks/edit_metadata_coverart_mask.png</mask>
             <preserveaspect>false</preserveaspect>
         </imagetype>
-        
+
         <textarea name="title_text" from="basetextarea">
             <area>40,46,124,36</area>
             <value>Title:</value>
             <align>right,vcenter</align>
         </textarea>
-        
+
         <textedit name="title_edit" from="base_textedit">
-            <area>177,46,366,36</area>
+            <area>177,46,885,36</area>
         </textedit>
 
         <textarea name="subtitle_text" from="basetextarea">
@@ -2376,6 +2440,26 @@
             <area>177,126,366,36</area>
         </textedit>
 
+        <textarea name="rating_text" from="basetextarea">
+            <area>556,86,124,36</area>
+            <value>Rating:</value>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <textedit name="rating_edit" from="base_textedit">
+            <area>696,86,366,36</area>
+        </textedit>
+
+        <textarea name="inetref_text" from="basetextarea">
+            <area>556,126,124,36</area>
+            <value>Video #:</value>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <textedit name="inetref_edit" from="base_textedit">
+            <area>696,126,366,36</area>
+        </textedit>
+
         <textarea name="tagline_text" from="basetextarea">
             <area>40,166,124,36</area>
             <value>Tagline:</value>
@@ -2406,26 +2490,6 @@
             <area>177,246,885,36</area>
         </textedit>
 
-        <textarea name="rating_text" from="basetextarea">
-            <area>556,46,124,36</area>
-            <value>Rating:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
-        <textedit name="rating_edit" from="base_textedit">
-            <area>696,46,366,36</area>
-        </textedit>
-
-        <textarea name="inetref_text" from="basetextarea">
-            <area>556,86,124,36</area>
-            <value>TMDB:</value>
-            <align>right,vcenter</align>
-        </textarea>
-
-        <textedit name="inetref_edit" from="base_textedit">
-            <area>696,86,366,36</area>
-        </textedit>
-
         <textarea name="season_text" from="basetextarea">
             <area>48,327,132,40</area>
             <value>Season:</value>
@@ -2519,13 +2583,13 @@
         <textarea name="coverart_text" from="basetextarea">
             <area>636,325,416,40</area>
             <font>basesmaller</font>
-            <value>/path/to/the/thing.jpg</value>
+            <value>No Image</value>
             <align>vcenter</align>
         </textarea>
 
         <button name="net_coverart_button" from="base_button">
             <area>1084,327,150,36</area>
-            <value>Find OnNet</value>
+            <value>Find Online</value>
         </button>
 
         <textarea name="banner_text_label" from="basetextarea">
@@ -2541,15 +2605,15 @@
         <textarea name="banner_text" from="basetextarea">
             <area>636,375,416,40</area>
             <font>basesmaller</font>
-            <value>/path/to/the/thing.jpg</value>
+            <value>No Image</value>
             <align>vcenter</align>
         </textarea>
 
         <button name="net_banner_button" from="base_button">
             <area>1084,377,150,36</area>
-            <value>Find OnNet</value>
+            <value>Find Online</value>
         </button>
-        
+
         <textarea name="browse_text" from="basetextarea">
             <area>452,425,130,40</area>
             <value>Browseable:</value>
@@ -2573,13 +2637,13 @@
         <textarea name="fanart_text" from="basetextarea">
             <area>636,475,416,40</area>
             <font>basesmaller</font>
-            <value>/path/to/the/thing.jpg</value>
+            <value>No Image</value>
             <align>vcenter</align>
         </textarea>
 
         <button name="net_fanart_button" from="base_button">
             <area>1084,477,150,36</area>
-            <value>Find OnNet</value>
+            <value>Find Online</value>
         </button>
 
         <textarea name="screenshot_text_label" from="basetextarea">
@@ -2595,13 +2659,13 @@
         <textarea name="screenshot_text" from="basetextarea">
             <area>636,525,416,40</area>
             <font>basesmaller</font>
-            <value>/path/to/the/thing.jpg</value>
+            <value>No Image</value>
             <align>vcenter</align>
         </textarea>
         
         <button name="net_screenshot_button" from="base_button">
             <area>1084,527,150,36</area>
-            <value>Find OnNet</value>
+            <value>Find Online</value>
         </button>
 
         <textarea name="trailer_text_label" from="basetextarea">
@@ -2617,7 +2681,7 @@
         <textarea name="trailer_text" from="basetextarea">
             <area>636,575,416,40</area>
             <font>basesmaller</font>
-            <value>/path/to/the/thing.jpg</value>
+            <value>No Image</value>
             <align>vcenter</align>
         </textarea>
 
@@ -2947,83 +3011,85 @@
             <multiline>no</multiline>
             <font>basesmalldarkyellow</font>
             <align>allcenter</align>
-            <cutdown>yes</cutdown>
+            <scroll direction="left" rate="80" startdelay="2"/>
         </textarea>
 
         <textarea name="description" from="basetextarea">
-            <area>23,54,527,214</area>
+            <area>23,60,527,202</area>
             <multiline>yes</multiline>
             <font>basesmaller</font>
+            <scroll direction="up" rate="20" startdelay="5"/>
         </textarea>
 
         <textarea name="cast" from="basetextarea">
-            <area>23,275,527,48</area>
+            <area>25,279,527,38</area>
             <multiline>yes</multiline>
-            <font>basesmaller</font>
+            <font>baseextrasmall</font>
+            <scroll direction="up" rate="20" startdelay="5"/>
         </textarea>
 
         <textarea name="dirlbl" from="basetextarea">
-            <area>23,325,112,24</area>
-            <font>basesmaller</font>
-            <value>Directed by:</value>
-            <align>left,vcenter</align>
+            <area>23,325,82,24</area>
+            <font>basesmallerblue</font>
+            <value>Director:</value>
+            <align>right,vcenter</align>
         </textarea>
 
         <textarea name="director" from="basetextarea">
-            <area>145,326,405,24</area>
-            <font>basesmallerblue</font>
+            <area>115,325,435,24</area>
+            <font>basesmaller</font>
             <align>left,vcenter</align>
         </textarea>
         
         <textarea name="yearlbl" from="basetextarea">
-            <area>23,354,46,24</area>
-            <font>basesmaller</font>
-            <align>left,vcenter</align>
+            <area>23,354,82,24</area>
+            <font>basesmallerblue</font>
+            <align>right,vcenter</align>
             <value>Year:</value>
         </textarea>
 
         <textarea name="year" from="basetextarea">
-            <area>79,356,80,24</area>
-            <font>basesmallerblue</font>
+            <area>115,354,150,24</area>
+            <font>basesmaller</font>
         </textarea>
 
         <textarea name="lengthlbl" from="basetextarea">
             <area>342,354,84,24</area>
-            <font>basesmaller</font>
+            <font>basesmallerblue</font>
             <align>right,vcenter</align>
             <value>Runtime:</value>
         </textarea>
 
         <textarea name="length" from="basetextarea">
-            <area>436,355,114,24</area>
-            <font>basesmallerblue</font>
+            <area>436,354,114,24</area>
+            <font>basesmaller</font>
             <align>left,vcenter</align>
         </textarea>
 
        <textarea name="seasonlbl" from="basetextarea">
-            <area>88,382,90,20</area>
-            <font>baseextrasmall</font>
+            <area>23,380,82,24</area>
+            <font>basesmallerblue</font>
             <value>Season:</value>
             <align>right,vcenter</align>
         </textarea>
 
         <textarea name="season" from="basetextarea">
-            <area>188,382,110,20</area>
-            <font>baseextrasmallblue</font>
-            <align>vcenter</align>
+            <area>115,380,150,24</area>
+            <font>basesmaller</font>
+            <align>left,vcenter</align>
         </textarea>
 
         <textarea name="episodelbl" from="basetextarea">
-            <area>331,382,94,20</area>
-            <font>baseextrasmall</font>
+            <area>331,380,94,24</area>
+            <font>basesmallerblue</font>
             <align>right,vcenter</align>
             <value>Episode:</value>
         </textarea>
 
         <textarea name="episode" from="basetextarea">
-            <area>435,382,110,20</area>
-            <font>baseextrasmallblue</font>
-            <align>vcenter</align>
+            <area>435,380,110,24</area>
+            <font>basesmaller</font>
+            <align>left,vcenter</align>
         </textarea>
 
         <imagetype name="coverart">
@@ -3050,6 +3116,9 @@
                     <group name="select_bar" from="base_button_select_bar_selected_group">
                         <area>0,0,100%,100%</area>
                     </group>
+                    <textarea name="buttontext">
+                        <font>basesmallyellow</font>
+                    </textarea>
                 </state>
                 <state name="pushed" from="active">
                     <group name="select_bar" from="base_button_select_bar_pushed_group">
@@ -3080,6 +3149,9 @@
                     <group name="select_bar" from="base_button_select_bar_selected_group">
                         <area>0,0,100%,100%</area>
                     </group>
+                    <textarea name="buttontext">
+                        <font>basesmallyellow</font>
+                    </textarea>
                 </state>
                 <state name="pushed" from="active">
                     <group name="select_bar" from="base_button_select_bar_pushed_group">
@@ -3200,12 +3272,13 @@
         </buttonlist>
 
         <checkbox name="altcheck" from="base_checkbox">
-            <position>750,413</position>
+            <position>442,413</position>
         </checkbox>
 
         <textarea name="altcheck_text" from="basetextarea">
-            <area>475,413,265,30</area>
+            <area>242,397,190,60</area>
             <align>right,vcenter</align>
+            <multiline>yes</multiline>
             <value>Enable Alternate Player:</value>
         </textarea>
 
@@ -3221,19 +3294,19 @@
 
         <textarea name="helptext" from="basetextarea">
             <area>239,551,802,61</area>
-            <font>basesmallerblue</font>
+            <font>basesmaller</font>
             <multiline>true</multiline>
             <align>allcenter</align>
         </textarea>
 
-        <button name="ok" from="base_button">
+        <button name="cancel" from="base_button">
             <area>273,628,350,40</area>
-            <value>OK</value>
+            <value>Cancel</value>
         </button>
 
-        <button name="cancel" from="base_button">
+        <button name="ok" from="base_button">
             <area>657,628,350,40</area>
-            <value>Cancel</value>
+            <value>Save</value>
         </button>
 
     </window>
@@ -3313,7 +3386,7 @@
             <position>390,175</position>
         </checkbox>
 
-        <textarea name="trailerplay_text" from="basetextarea">
+        <textarea name="trailerplay_text" from="basetextarea" depends="randomtrailercheck">
             <area>245,259,175,40</area>
             <value>Trailers to Play:</value>
             <align>right,vcenter</align>
@@ -3345,21 +3418,21 @@
 
         <textarea name="helptext" from="basetextarea">
             <area>239,523,802,76</area>
-            <font>basesmallerblue</font>
+            <font>basesmaller</font>
             <multiline>true</multiline>
             <align>allcenter</align>
         </textarea>
 
-        <button name="ok" from="base_button">
-            <area>273,622,350,40</area>
-            <value>OK</value>
-        </button>
-
         <button name="cancel" from="base_button">
-            <area>657,622,350,40</area>
+            <area>273,628,350,40</area>
             <value>Cancel</value>
         </button>
 
+        <button name="ok" from="base_button">
+            <area>657,628,350,40</area>
+            <value>Save</value>
+        </button>
+
     </window>
     
 </mythuitheme>