--- osd.xml.orig	2016-04-13 19:13:53.605408871 +0000
+++ osd.xml	2016-04-14 22:00:37.243291623 +0000
@@ -7,13 +7,13 @@
     <window name="osd_debug">
         <area>0,0,1280,720</area>
 
-        <fontdef name="medium" face="DejaVu Sans">
-            <pixelsize>16</pixelsize>
+        <fontdef name="medium" face="Overlock">
+            <pixelsize>18</pixelsize>
             <color>#e6e6e6</color>
         </fontdef>
 
         <fontdef name="mediumblue" from="medium">
-            <color>#3a9ade</color>
+            <color>#0072bc</color>
         </fontdef>
 
         <shape name="osd-debug-backdrop">
@@ -71,7 +71,7 @@
         </textarea>
 
         <textarea name="load">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>241,51,216,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -84,7 +84,7 @@
         </textarea>
 
         <textarea name="filename">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>515,51,685,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -97,7 +97,7 @@
         </textarea>
 
         <textarea name="storagerate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>247,76,123,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -110,7 +110,7 @@
         </textarea>
 
         <textarea name="decoderrate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>247,101,123,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -123,7 +123,7 @@
         </textarea>
 
         <textarea name="bufferavail">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>247,126,123,25</area>
             <align>left,vcenter</align>
             <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template>
@@ -137,7 +137,7 @@
         </textarea>
 
         <textarea name="videowidth">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>515,76,250,25</area>
             <align>left,vcenter</align>
             <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
@@ -151,7 +151,7 @@
         </textarea>
 
         <textarea name="videocodec">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>515,101,150,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -164,7 +164,7 @@
         </textarea>
 
         <textarea name="videodecoder">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>515,126,150,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -177,7 +177,7 @@
         </textarea>
 
         <textarea name="avsync">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,76,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -190,7 +190,7 @@
         </textarea>
 
         <textarea name="framerate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,101,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -203,7 +203,7 @@
         </textarea>
 
         <textarea name="videoframes">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,126,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -216,7 +216,7 @@
         </textarea>
 
         <textarea name="audiocodec">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,76,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -229,7 +229,7 @@
         </textarea>
 
         <textarea name="audiochannels">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,101,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -242,7 +242,7 @@
         </textarea>
 
         <textarea name="samplerate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,126,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -252,8 +252,8 @@
     <window name="osd_message">
         <area>0,0,1280,720</area>
 
-        <fontdef name="medium" face="DejaVu Sans">
-            <pixelsize>24</pixelsize>
+        <fontdef name="medium" face="Overlock">
+            <pixelsize>28</pixelsize>
             <color>#e6e6e6</color>
         </fontdef>
 
@@ -315,9 +315,9 @@
     <window name="osd_input">
         <area>0,0,1280,720</area>
 
-        <fontdef name="large" face="DejaVu Sans">
+        <fontdef name="large" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>32</pixelsize>
+            <pixelsize>34</pixelsize>
         </fontdef>
 
         <shape name="osd-input-backdrop">
@@ -378,9 +378,9 @@
     <window name="osd_status">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>18</pixelsize>
+            <pixelsize>20</pixelsize>
         </fontdef>
 
         <shape name="osd-status-backdrop">
@@ -436,12 +436,19 @@
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="description">
-            <area>90,658,1100,24</area>
+        <textarea name="value">
+            <area>90,657,1100,24</area>
             <font>small</font>
             <align>allcenter</align>
-            <template>%DESCRIPTION%
-            %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
+            <template>%VALUE%%UNITS%</template>
+        </textarea>
+
+        <textarea name="playedtime" depends="!value">
+            <area>90,657,1100,24</area>
+            <font>small</font>
+            <align>allcenter</align>
+            <template>%PLAYEDTIME% of %TOTALTIME%
+            %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template>
         </textarea>
 
         <clock name="clock">
@@ -470,39 +477,39 @@
     <window name="program_info">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>21</pixelsize>
+            <pixelsize>23</pixelsize>
         </fontdef>
 
 	<fontdef name="supersmall" from="small">
             <weight>bold</weight>
-            <pixelsize>12</pixelsize>
+            <pixelsize>14</pixelsize>
         </fontdef>
 
         <fontdef name="smaller" from="small">
-            <pixelsize>16</pixelsize>
+            <pixelsize>18</pixelsize>
         </fontdef>
 
         <fontdef name="mediumsmall" from="small">
-            <pixelsize>18</pixelsize>
+            <pixelsize>20</pixelsize>
         </fontdef>
 
         <fontdef name="medium" from="small">
-            <pixelsize>22</pixelsize>
+            <pixelsize>24</pixelsize>
         </fontdef>
 
         <fontdef name="title" from="small">
-            <color>#d9d900</color>
-            <pixelsize>26</pixelsize>
+            <color>#ebb81c</color>
+            <pixelsize>28</pixelsize>
         </fontdef>
 
         <fontdef name="large" from="small">
-            <pixelsize>28</pixelsize>
+            <pixelsize>30</pixelsize>
         </fontdef>
 
         <fontdef name="supersmallblue" from="supersmall">
-            <color>#3a9ade</color>
+            <color>#0072bc</color>
         </fontdef>
 
         <shape name="program-info-backdrop">
@@ -1015,25 +1022,30 @@
     <window name="browse_info">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>21</pixelsize>
+            <pixelsize>23</pixelsize>
         </fontdef>
 
         <fontdef name="smaller" from="small">
-            <pixelsize>18</pixelsize>
+            <pixelsize>20</pixelsize>
         </fontdef>
 
         <fontdef name="medium" from="small">
-            <pixelsize>24</pixelsize>
+            <pixelsize>26</pixelsize>
+        </fontdef>
+
+        <fontdef name="title" from="small">
+            <color>#ebb81c</color>
+            <pixelsize>28</pixelsize>
         </fontdef>
 
         <fontdef name="large" from="small">
-            <pixelsize>26</pixelsize>
+            <pixelsize>28</pixelsize>
         </fontdef>
 
         <fontdef name="smallerblue" from="smaller">
-            <color>#3a9ade</color>
+            <color>#0072bc</color>
         </fontdef>
 
         <shape name="browse-info-backdrop">
@@ -1084,7 +1096,7 @@
         </shape>
 
         <shape name="title-backdrop-line">
-            <area>219,489,834,68</area>
+            <area>219,489,996,68</area>
             <type>roundbox</type>
             <fill color="#000000" alpha="0" />
             <line color="#ffffff" alpha="45" width="2" />
@@ -1092,11 +1104,11 @@
         </shape>
 
         <shape name="title-top-line" from="channel-top-line">
-            <area>220,490,832,2</area>
+            <area>220,490,994,2</area>
         </shape>
 
         <shape name="title-bottom-line" from="channel-top-line">
-            <area>220,554,832,2</area>
+            <area>220,554,994,2</area>
         </shape>
 
         <shape name="title-left-line" from="channel-left-line">
@@ -1104,30 +1116,6 @@
         </shape>
 
         <shape name="title-right-line" from="channel-left-line">
-            <area>1050,492,2,62</area>
-        </shape>
-
-        <shape name="clock-backdrop-line">
-            <area>1057,489,158,68</area>
-            <type>roundbox</type>
-            <fill color="#000000" alpha="0" />
-            <line color="#ffffff" alpha="45" width="2" />
-            <cornerradius>6</cornerradius>
-        </shape>
-
-        <shape name="clock-top-line" from="channel-top-line">
-            <area>1058,490,156,2</area>
-        </shape>
-
-        <shape name="clock-bottom-line" from="channel-top-line">
-            <area>1058,554,156,2</area>
-        </shape>
-
-        <shape name="clock-left-line" from="channel-left-line">
-            <area>1058,492,2,62</area>
-        </shape>
-
-        <shape name="clock-right-line" from="channel-left-line">
             <area>1212,492,2,62</area>
         </shape>
 
@@ -1175,30 +1163,30 @@
         </textarea>
 
         <textarea name="title">
-            <font>medium</font>
+            <font>title</font>
             <area>228,494,816,30</area>
             <align>left,vcenter</align>
         </textarea>
 
         <textarea name="timedate">
-            <font>smallerblue</font>
+            <font>smaller</font>
             <area>228,529,497,22</area>
             <align>vcenter</align>
             <template>%TIMEDATE% : %LENMINS%</template>
         </textarea>
 
         <textarea name="longrepeat">
-            <font>smallerblue</font>
-            <area>740,530,304,20</area>
+            <font>smaller</font>
+            <area>902,530,310,20</area>
             <align>right,vcenter</align>
             <template>%LONGREPEAT%</template>
         </textarea>
 
         <clock name="clock">
-            <area>1060,492,152,62</area>
-            <font>large</font>
+            <area>1086,494,120,30</area>
+            <font>medium</font>
             <template>%TIME%</template>
-            <align>allcenter</align>
+            <align>right,vcenter</align>
         </clock>
 
         <textarea name="description">
@@ -1214,9 +1202,9 @@
     <window name="ChannelEditor">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>20</pixelsize>
+            <pixelsize>22</pixelsize>
         </fontdef>
 
         <fontdef name="smallblack" from="small">
@@ -1224,7 +1212,7 @@
         </fontdef>
 
         <fontdef name="smallblue" from="small">
-            <color>#3a9ade</color>
+            <color>#0072bc</color>
         </fontdef>
 
         <fontdef name="smallgrey" from="small">
@@ -1232,7 +1220,7 @@
         </fontdef>
 
         <fontdef name="medium" from="small">
-            <pixelsize>24</pixelsize>
+            <pixelsize>26</pixelsize>
         </fontdef>
 
         <shape name="channel-editor-backdrop">
@@ -1610,9 +1598,9 @@
     <window name="osd_program_editor">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#e6e6e6</color>
-            <pixelsize>18</pixelsize>
+            <pixelsize>20</pixelsize>
         </fontdef>
 
         <shape name="osd-program-editor-backdrop">
@@ -1663,13 +1651,17 @@
         </shape>
 
         <textarea name="title">
-            <area>104,626,600,24</area>
+            <area>104,626,250,24</area>
             <font>small</font>
             <align>left,vcenter</align>
         </textarea>
-
+<!--
+        <imagetype name="audiograph">
+            <area>364,628,552,20</area>
+        </imagetype>
+-->
         <textarea name="seekamount" from="title">
-            <area>876,626,300,24</area>
+            <area>926,626,250,24</area>
             <align>right,vcenter</align>
         </textarea>
 
@@ -1749,9 +1741,9 @@
     <window name="MythPopupBox">
         <area>0,0,1280,720</area>
 
-        <fontdef name="small" face="DejaVu Sans">
+        <fontdef name="small" face="Overlock">
             <color>#ffffff</color>
-            <pixelsize>21</pixelsize>
+            <pixelsize>23</pixelsize>
         </fontdef>
 
         <fontdef name="smallgrey" from="small">
@@ -1759,7 +1751,7 @@
         </fontdef>
 
         <fontdef name="smallyellow" from="small">
-            <color>#d9d900</color>
+            <color>#ebb81c</color>
         </fontdef>
 
         <shape name="mythpopupbox-backdrop">