--- osd.xml.orig	2016-10-25 18:54:13.696402426 +0000
+++ osd.xml	2016-10-25 18:53:00.649172353 +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">
@@ -63,109 +63,97 @@
             <area>1212,40,2,120</area>
         </shape>
 
-        <textarea name="cpuload">
+        <textarea name="file">
             <font>medium</font>
-            <area>74,51,162,25</area>
+            <area>74,51,132,25</area>
             <align>right,vcenter</align>
-            <value>CPUs :</value>
+            <value>File :</value>
         </textarea>
 
-        <textarea name="load">
-            <font>mediumblue</font>
-            <area>241,51,216,25</area>
+        <textarea name="filename">
+            <font>medium</font>
+            <area>211,51,995,25</area>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="file">
+        <textarea name="cpuload">
             <font>medium</font>
-            <area>450,51,60,25</area>
+            <area>74,76,132,25</area>
             <align>right,vcenter</align>
-            <value>File :</value>
+            <value>CPUs :</value>
         </textarea>
 
-        <textarea name="filename">
-            <font>mediumblue</font>
-            <area>515,51,685,25</area>
+        <textarea name="load">
+            <font>medium</font>
+            <area>211,76,169,25</area>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="storage">
+        <textarea name="video">
             <font>medium</font>
-            <area>74,76,162,25</area>
+            <area>74,101,132,25</area>
             <align>right,vcenter</align>
-            <value>Storage to Buffer :</value>
+            <value>Video :</value>
         </textarea>
 
-        <textarea name="storagerate">
-            <font>mediumblue</font>
-            <area>247,76,123,25</area>
+        <textarea name="videowidth">
+            <font>medium</font>
+            <area>211,101,169,25</area>
             <align>left,vcenter</align>
+            <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
         </textarea>
 
-        <textarea name="decoder">
+        <textarea name="vidcodec">
             <font>medium</font>
-            <area>74,101,162,25</area>
+            <area>74,126,132,25</area>
             <align>right,vcenter</align>
-            <value>Buffer to Decoder :</value>
+            <value>Codec/Decoder :</value>
         </textarea>
 
-        <textarea name="decoderrate">
-            <font>mediumblue</font>
-            <area>247,101,123,25</area>
+        <textarea name="videocodec">
+            <font>medium</font>
+            <area>211,126,169,25</area>
             <align>left,vcenter</align>
+            <template>%VIDEOCODEC%/%VIDEODECODER%</template>
         </textarea>
 
         <textarea name="buffer">
             <font>medium</font>
-            <area>74,126,162,25</area>
+            <area>385,76,160,25</area>
             <align>right,vcenter</align>
             <value>Available Buffer :</value>
         </textarea>
 
         <textarea name="bufferavail">
-            <font>mediumblue</font>
-            <area>247,126,123,25</area>
+            <font>medium</font>
+            <area>550,76,123,25</area>
             <align>left,vcenter</align>
             <template>%BUFFERAVAIL% of %BUFFERSIZE%Mb</template>
         </textarea>
 
-        <textarea name="video">
+        <textarea name="storage">
             <font>medium</font>
-            <area>410,76,100,25</area>
+            <area>385,101,160,25</area>
             <align>right,vcenter</align>
-            <value>Video :</value>
-        </textarea>
-
-        <textarea name="videowidth">
-            <font>mediumblue</font>
-            <area>515,76,250,25</area>
-            <align>left,vcenter</align>
-            <template>%VIDEOWIDTH%x%VIDEOHEIGHT%@%VIDEOFRAMERATE%fps</template>
+            <value>Storage to Buffer :</value>
         </textarea>
 
-        <textarea name="vidcodec">
+        <textarea name="storagerate">
             <font>medium</font>
-            <area>410,101,100,25</area>
-            <align>right,vcenter</align>
-            <value>Codec :</value>
-        </textarea>
-
-        <textarea name="videocodec">
-            <font>mediumblue</font>
-            <area>515,101,150,25</area>
+            <area>550,101,123,25</area>
             <align>left,vcenter</align>
         </textarea>
 
-        <textarea name="viddec">
+        <textarea name="decoder">
             <font>medium</font>
-            <area>410,126,100,25</area>
+            <area>385,126,160,25</area>
             <align>right,vcenter</align>
-            <value>Decoder :</value>
+            <value>Buffer to Decoder :</value>
         </textarea>
 
-        <textarea name="videodecoder">
-            <font>mediumblue</font>
-            <area>515,126,150,25</area>
+        <textarea name="decoderrate">
+            <font>medium</font>
+            <area>550,126,123,25</area>
             <align>left,vcenter</align>
         </textarea>
 
@@ -177,7 +165,7 @@
         </textarea>
 
         <textarea name="avsync">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,76,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -190,7 +178,7 @@
         </textarea>
 
         <textarea name="framerate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,101,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -203,7 +191,7 @@
         </textarea>
 
         <textarea name="videoframes">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>875,126,100,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -216,7 +204,7 @@
         </textarea>
 
         <textarea name="audiocodec">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,76,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -229,7 +217,7 @@
         </textarea>
 
         <textarea name="audiochannels">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,101,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -242,7 +230,7 @@
         </textarea>
 
         <textarea name="samplerate">
-            <font>mediumblue</font>
+            <font>medium</font>
             <area>1129,126,77,25</area>
             <align>left,vcenter</align>
         </textarea>
@@ -252,8 +240,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 +303,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 +366,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 +424,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>%VALUE%%UNITS%</template>
+        </textarea>
+
+        <textarea name="playedtime" depends="!value">
+            <area>90,657,1100,24</area>
             <font>small</font>
             <align>allcenter</align>
-            <template>%DESCRIPTION%
-            %(|REMAININGTIME|)%%(|BEHINDTIME|)%%VALUE%%UNITS%</template>
+            <template>%PLAYEDTIME% of %TOTALTIME%
+            %(|REMAININGTIME| remains)%%(|BEHINDTIME| behind)%</template>
         </textarea>
 
         <clock name="clock">
@@ -470,39 +465,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">
@@ -865,6 +860,15 @@
                     <value>VideoCodec: H.264</value>
                 </textarea>
             </state>
+            <state name="HEVC">
+                <textarea name="HEVC">
+                    <area>830,432,180,16</area>
+                    <font>supersmallblue</font>
+                    <cutdown>no</cutdown>
+                    <align>allcenter</align>
+                    <value>VideoCodec: HEVC</value>
+                </textarea>
+            </state>
             <state name="MPEG-4">
                 <textarea name="MPEG-4">
                     <area>830,432,180,16</area>
@@ -988,7 +992,7 @@
             <alpha>255</alpha>
         </imagetype>
 
-	<textarea name="category">
+        <textarea name="category">
             <font>supersmallblue</font>
             <area>284,490,912,28</area>
             <align>allcenter</align>
@@ -1003,37 +1007,49 @@
             <template>%"|SUBTITLE|"  %%YEARSTARS| %%DESCRIPTION%</template>
         </textarea>
 
-        <textarea name="programid">
+        <textarea name="programid" depends="iconpath&amp;!coverart">
             <font>supersmallblue</font>
             <area>284,653,912,27</area>
             <align>allcenter</align>
             <template>Season/Episode: %s00e00%               ProgramID: %PROGRAMID%               SeriesID: %SERIESID%</template>
         </textarea>
 
+        <textarea name="channame" depends="iconpath&amp;coverart">
+            <font>supersmallblue</font>
+            <area>284,653,912,27</area>
+            <align>allcenter</align>
+            <template>Channel: %channum% - %channame% - %callsign%               Season/Episode: %s00e00%               ProgramID: %PROGRAMID%               SeriesID: %SERIESID%</template>
+        </textarea>
+
     </window>
 
     <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 +1100,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 +1108,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 +1120,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 +1167,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 +1206,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 +1216,7 @@
         </fontdef>
 
         <fontdef name="smallblue" from="small">
-            <color>#3a9ade</color>
+            <color>#0072bc</color>
         </fontdef>
 
         <fontdef name="smallgrey" from="small">
@@ -1232,7 +1224,7 @@
         </fontdef>
 
         <fontdef name="medium" from="small">
-            <pixelsize>24</pixelsize>
+            <pixelsize>26</pixelsize>
         </fontdef>
 
         <shape name="channel-editor-backdrop">
@@ -1610,9 +1602,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 +1655,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 +1745,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 +1755,7 @@
         </fontdef>
 
         <fontdef name="smallyellow" from="small">
-            <color>#d9d900</color>
+            <color>#ebb81c</color>
         </fontdef>
 
         <shape name="mythpopupbox-backdrop">