From dcdc5729ab08937ad382846d1e53140e8f93e86e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Dec 2022 01:11:26 -0500
Subject: linhes-theme: updates for LH 9

---
 linhes/linhes-theme/LHLogo.png                 |  Bin 0 -> 95713 bytes
 linhes/linhes-theme/LHLogoAndText.png          |  Bin 0 -> 112895 bytes
 linhes/linhes-theme/PKGBUILD                   |  141 ++
 linhes/linhes-theme/background-with-logo.png   |  Bin 0 -> 821488 bytes
 linhes/linhes-theme/background.png             |  Bin 0 -> 781602 bytes
 linhes/linhes-theme/base.xml.patch             |  978 ++++++++++++++
 linhes/linhes-theme/blank_coverart.png         |  Bin 0 -> 50947 bytes
 linhes/linhes-theme/browser-ui.xml.patch       |   69 +
 linhes/linhes-theme/bubble_background.png      |  Bin 0 -> 1857101 bytes
 linhes/linhes-theme/checkmark.png              |  Bin 0 -> 24628 bytes
 linhes/linhes-theme/config-ui.xml.patch        |  673 ++++++++++
 linhes/linhes-theme/controls-ui.xml.patch      |   20 +
 linhes/linhes-theme/error.png                  |  Bin 0 -> 16172 bytes
 linhes/linhes-theme/gears.png                  |  Bin 0 -> 24505 bytes
 linhes/linhes-theme/gg-left-arrow-large.png    |  Bin 0 -> 2082 bytes
 linhes/linhes-theme/gg-right-arrow-large.png   |  Bin 0 -> 2047 bytes
 linhes/linhes-theme/image-ui.xml               |  632 +++++++++
 linhes/linhes-theme/install-ui.xml             |  188 +++
 linhes/linhes-theme/lights_bud_background.png  |  Bin 0 -> 1284799 bytes
 linhes/linhes-theme/linhes-theme.install       |   19 +
 linhes/linhes-theme/menu-ui-vert.xml.patch     |  211 +++
 linhes/linhes-theme/music-base.xml.patch       |  121 ++
 linhes/linhes-theme/music-ui.xml.patch         |  704 ++++++++++
 linhes/linhes-theme/musicsettings-ui.xml.patch |  366 ++++++
 linhes/linhes-theme/mytharchive-ui.xml.patch   |   38 +
 linhes/linhes-theme/mythburn-ui.xml.patch      |   20 +
 linhes/linhes-theme/mythnative-ui.xml.patch    |   20 +
 linhes/linhes-theme/notification-ui.xml.patch  |  385 ++++++
 linhes/linhes-theme/osd.xml.patch              | 1166 +++++++++++++++++
 linhes/linhes-theme/osd_subtitle.xml           |  142 ++
 linhes/linhes-theme/preview.png                |  Bin 0 -> 264596 bytes
 linhes/linhes-theme/progdetails_page1.html     |   63 +
 linhes/linhes-theme/qtlook.txt.patch           |   11 +
 linhes/linhes-theme/question.png               |  Bin 0 -> 25883 bytes
 linhes/linhes-theme/readme.txt.patch           |   29 +
 linhes/linhes-theme/recordings-ui.xml.patch    |  176 +++
 linhes/linhes-theme/schedule-ui.xml.patch      |  262 ++++
 linhes/linhes-theme/settings-ui.xml.patch      |   11 +
 linhes/linhes-theme/standardsetting-ui.xml     |  403 ++++++
 linhes/linhes-theme/status-ui.xml.patch        |  201 +++
 linhes/linhes-theme/stream-ui.xml.patch        |  568 ++++++++
 linhes/linhes-theme/themeinfo.xml              |   59 +
 linhes/linhes-theme/tux_thoughts.png           |  Bin 0 -> 50666 bytes
 linhes/linhes-theme/video-ui.xml.patch         | 1654 ++++++++++++++++++++++++
 linhes/linhes-theme/warning.png                |  Bin 0 -> 5436 bytes
 linhes/linhes-theme/weather-ui.xml.patch       |  126 ++
 46 files changed, 9456 insertions(+)
 create mode 100644 linhes/linhes-theme/LHLogo.png
 create mode 100644 linhes/linhes-theme/LHLogoAndText.png
 create mode 100755 linhes/linhes-theme/PKGBUILD
 create mode 100644 linhes/linhes-theme/background-with-logo.png
 create mode 100644 linhes/linhes-theme/background.png
 create mode 100644 linhes/linhes-theme/base.xml.patch
 create mode 100644 linhes/linhes-theme/blank_coverart.png
 create mode 100644 linhes/linhes-theme/browser-ui.xml.patch
 create mode 100644 linhes/linhes-theme/bubble_background.png
 create mode 100644 linhes/linhes-theme/checkmark.png
 create mode 100644 linhes/linhes-theme/config-ui.xml.patch
 create mode 100644 linhes/linhes-theme/controls-ui.xml.patch
 create mode 100644 linhes/linhes-theme/error.png
 create mode 100644 linhes/linhes-theme/gears.png
 create mode 100644 linhes/linhes-theme/gg-left-arrow-large.png
 create mode 100644 linhes/linhes-theme/gg-right-arrow-large.png
 create mode 100644 linhes/linhes-theme/image-ui.xml
 create mode 100644 linhes/linhes-theme/install-ui.xml
 create mode 100644 linhes/linhes-theme/lights_bud_background.png
 create mode 100644 linhes/linhes-theme/linhes-theme.install
 create mode 100644 linhes/linhes-theme/menu-ui-vert.xml.patch
 create mode 100644 linhes/linhes-theme/music-base.xml.patch
 create mode 100644 linhes/linhes-theme/music-ui.xml.patch
 create mode 100644 linhes/linhes-theme/musicsettings-ui.xml.patch
 create mode 100644 linhes/linhes-theme/mytharchive-ui.xml.patch
 create mode 100644 linhes/linhes-theme/mythburn-ui.xml.patch
 create mode 100644 linhes/linhes-theme/mythnative-ui.xml.patch
 create mode 100644 linhes/linhes-theme/notification-ui.xml.patch
 create mode 100644 linhes/linhes-theme/osd.xml.patch
 create mode 100644 linhes/linhes-theme/osd_subtitle.xml
 create mode 100644 linhes/linhes-theme/preview.png
 create mode 100644 linhes/linhes-theme/progdetails_page1.html
 create mode 100644 linhes/linhes-theme/qtlook.txt.patch
 create mode 100644 linhes/linhes-theme/question.png
 create mode 100644 linhes/linhes-theme/readme.txt.patch
 create mode 100644 linhes/linhes-theme/recordings-ui.xml.patch
 create mode 100644 linhes/linhes-theme/schedule-ui.xml.patch
 create mode 100644 linhes/linhes-theme/settings-ui.xml.patch
 create mode 100644 linhes/linhes-theme/standardsetting-ui.xml
 create mode 100644 linhes/linhes-theme/status-ui.xml.patch
 create mode 100644 linhes/linhes-theme/stream-ui.xml.patch
 create mode 100644 linhes/linhes-theme/themeinfo.xml
 create mode 100644 linhes/linhes-theme/tux_thoughts.png
 create mode 100644 linhes/linhes-theme/video-ui.xml.patch
 create mode 100644 linhes/linhes-theme/warning.png
 create mode 100644 linhes/linhes-theme/weather-ui.xml.patch

diff --git a/linhes/linhes-theme/LHLogo.png b/linhes/linhes-theme/LHLogo.png
new file mode 100644
index 0000000..9ff4fd2
Binary files /dev/null and b/linhes/linhes-theme/LHLogo.png differ
diff --git a/linhes/linhes-theme/LHLogoAndText.png b/linhes/linhes-theme/LHLogoAndText.png
new file mode 100644
index 0000000..39504e7
Binary files /dev/null and b/linhes/linhes-theme/LHLogoAndText.png differ
diff --git a/linhes/linhes-theme/PKGBUILD b/linhes/linhes-theme/PKGBUILD
new file mode 100755
index 0000000..e622f31
--- /dev/null
+++ b/linhes/linhes-theme/PKGBUILD
@@ -0,0 +1,141 @@
+pkgname=linhes-theme
+pkgver=9.0.0
+pkgrel=1
+pkgdesc="Default LinHES MythTV theme"
+arch=('x86_64')
+license=('GPL2')
+url="http://linhes.org/"
+makedepends=('git' 'rsync')
+patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' 'browser-ui.xml.patch'
+         'config-ui.xml.patch' 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch'
+         'music-base.xml.patch' 'music-ui.xml.patch' 'musicsettings-ui.xml.patch'
+         'mytharchive-ui.xml.patch' 'mythburn-ui.xml.patch'
+         'mythnative-ui.xml.patch'
+         'notification-ui.xml.patch' 'qtlook.txt.patch'
+         'recordings-ui.xml.patch' 'schedule-ui.xml.patch' 'settings-ui.xml.patch'
+         'status-ui.xml.patch' 'stream-ui.xml.patch' 'video-ui.xml.patch'
+         'weather-ui.xml.patch')
+
+#The LinHES theme is based on TintedGlass 4.56 by Harley Peters
+source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml'
+        'lights_bud_background.png' 'preview.png' 'blank_coverart.png'
+        'gg-left-arrow-large.png' 'gg-right-arrow-large.png'
+        'checkmark.png' 'error.png' 'gears.png' 'question.png' 'warning.png'
+        'image-ui.xml' 'standardsetting-ui.xml'
+        'LHLogo.png' 'LHLogoAndText.png')
+install=$pkgname.install
+
+prepare() {
+    _gitroot="https://github.com/MythTV-Themes/TintedGlass.git"
+    _gitname="TintedGlass"
+    _gitbranch="fixes/32"
+
+    cd $srcdir
+    if [ -d $_gitname ]
+    then
+        cd $_gitname 
+        git checkout $_gitbranch
+        git pull
+        msg "TintedGlass local files updated."
+    else
+        git clone -b $_gitbranch $_gitroot
+        msg "TintedGlass git checkout done."
+    fi
+}
+
+package() {
+    THEMEROOT=usr/share/mythtv/themes
+
+    msg "Copying theme to package"
+    mkdir -p $pkgdir/$THEMEROOT/LinHES/
+    rsync -arp --exclude .git* --delete-excluded $srcdir/TintedGlass/* $pkgdir/$THEMEROOT/LinHES/
+
+    msg "--------------------------applying patches------------------------------"
+    cd $pkgdir/$THEMEROOT/LinHES/
+    for i in `echo ${patches[@]:0}`
+    do
+        echo applying $i
+        patch -N -i ${srcdir}/$i || return 1
+        echo "-----------------------------"
+    done
+    cd $startdir
+    msg "--------------------------done applying patches-------------------------"
+
+    msg "Copy *.xml and adding backgrounds and images for LinHES"
+    rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/
+    rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/*
+    rm -r $pkgdir/$THEMEROOT/LinHES/osd.xml.alt
+    rsync -pL $srcdir/lights_bud_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png
+    rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/gg-left-arrow-large.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/gg-right-arrow-large.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/checkmark.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/error.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/gears.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/question.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/warning.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/
+
+    rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/
+    rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/
+
+    #remove old htmls directory
+    rm -r $pkgdir/$THEMEROOT/LinHES/htmls
+
+    #vertical menu
+    mv $pkgdir/$THEMEROOT/LinHES/menu-ui-vert.xml $pkgdir/$THEMEROOT/LinHES/menu-ui.xml
+
+    msg "Modifying yellows and blue to LinHES yellow and blue"
+    #yellow
+    grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#d9d900/\#ebb81c/g"
+    #darkyellow
+    grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#CCCC29/\#ebb81c/g"
+    #blue
+    grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#3a9ade/\#0072bc/g"
+
+    msg "Modifying fonts to Overlock"
+    grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\DejaVu Sans/\Overlock/g"
+
+    msg "Updating themeinfo.xml version number"
+    sed -i "s/MAJ_VER/${pkgver//.}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
+    sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
+}
+md5sums=('2dca856c2a4d1f959473512c94e43b60'
+         '7ad16012e4c5f9419089e42c539fe6af'
+         '31cd00ab3f10329a15f238dbe2b43708'
+         'd1d54968a2297924673d9653f707df33'
+         '25ff929dc4aca3b2a0bd38d9ded5a6b8'
+         '26a6db272dee225b9e4dc282f1494e51'
+         'b90b745c72a057c78ebd0b6f2c5530b9'
+         'a0ea2d3e386c0b483b31aa1a2703f9eb'
+         '8f8c27146e11954f60913da6d1fce073'
+         '09806f2e1d1e6050cc0d10cc6c5daf36'
+         'cf259052229f42646d7f37023ec55f44'
+         '52bb1c1a6c693adc8c04227fb124955a'
+         '643e7d548587b8742ed5accb6d736257'
+         'dd1e013e806efc26049ea89637a51f83'
+         '9fe3371a8b964a7028126405cfaa330b'
+         '9eb628e751ad0cccc199779b5b23ac16'
+         '373e1fd01ba18640992bd5d2e7fd7bfe'
+         '384871202030f41148536e2e89bb1801'
+         '8efbd524cef4dd3f5fbe5b7d5ad854f0'
+         '8312aff444945f80a76100696c81cb2e'
+         'f62b200729eb9a69e3929f20f51d3d35'
+         '4125880d1739b196a8041ecc3d773ee2'
+         '5a8fb2a5f0e657d52be6f0a6a006ce72'
+         '274b6f8cb5cd82c5ce28422decd7754b'
+         'bfc32b9fa5dca3d46dd6f365ecb449b5'
+         '4feb9bcc8907cd112ffcd6d69fd6c04f'
+         '8fcd0acc11f4db33a9442949fb1a293d'
+         '699e3abe05523f454db3561bfc08b4b2'
+         'c3b17c90d85e9e9908d194570f2da3ac'
+         '39c3c560ed4d8779326f4e63861d8f33'
+         '60cb915909c477dbc2e18233ee6424d9'
+         '30ea7d2001b8562177b8f85f34f050a2'
+         'e8dee86a10ce7c4423a97305b38b4668'
+         'e8ac15e38b3dc99c9e889e439ba356de'
+         'e8cf0d3a55ba3be47deae55c05432141'
+         '3f600b966bd813dd27f620762ddb3ac8'
+         '4f9e4db179e80eb96a202d319f1b835c'
+         'b51ef0cbf8ed2d3a8c1a8257a89aceff'
+         '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/linhes/linhes-theme/background-with-logo.png b/linhes/linhes-theme/background-with-logo.png
new file mode 100644
index 0000000..ffdf9ef
Binary files /dev/null and b/linhes/linhes-theme/background-with-logo.png differ
diff --git a/linhes/linhes-theme/background.png b/linhes/linhes-theme/background.png
new file mode 100644
index 0000000..12544b2
Binary files /dev/null and b/linhes/linhes-theme/background.png differ
diff --git a/linhes/linhes-theme/base.xml.patch b/linhes/linhes-theme/base.xml.patch
new file mode 100644
index 0000000..51c7c72
--- /dev/null
+++ b/linhes/linhes-theme/base.xml.patch
@@ -0,0 +1,978 @@
+--- base.xml.orig	2018-04-17 14:44:34.438582684 +0000
++++ base.xml	2019-03-22 17:16:10.683904892 +0000
+@@ -3,55 +3,55 @@
+ <mythuitheme>
+ 
+     <!-- Base Font Definitions -->
+-    <fontdef name="basefont" face="DejaVu Sans">
++    <fontdef name="basefont" face="Overlock">
+         <color>#e6e6e6</color>
+-        <pixelsize>21</pixelsize>
++        <pixelsize>23</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesupersmall" from="basefont">
+-        <pixelsize>11</pixelsize>
++        <pixelsize>13</pixelsize>
+         <weight>bold</weight>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmall" from="basefont">
+         <weight>bold</weight>
+-        <pixelsize>13</pixelsize>
++        <pixelsize>15</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseevensmaller" from="basefont">
+         <weight>bold</weight>
+-        <pixelsize>16</pixelsize>
++        <pixelsize>18</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesmaller" from="basefont">
+-        <pixelsize>18</pixelsize>
++        <pixelsize>20</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesomewhatsmaller" from="basefont">
+-        <pixelsize>19</pixelsize>
++        <pixelsize>21</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basesmall" from="basefont">
+-        <pixelsize>20</pixelsize>
++        <pixelsize>22</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemedium" from="basefont">
+-        <pixelsize>22</pixelsize>
++        <pixelsize>24</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemediumshadow" from="basefont">
+-        <pixelsize>22</pixelsize>
++        <pixelsize>24</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>2,2</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+     </fontdef>
+ 
+     <fontdef name="basemediumlarger" from="basefont">
+-        <pixelsize>25</pixelsize>
++        <pixelsize>27</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargerbold" from="basefont">
+-        <pixelsize>25</pixelsize>
++        <pixelsize>27</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>3,3</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+@@ -59,15 +59,15 @@
+     </fontdef>
+ 
+     <fontdef name="baselarge" from="basefont">
+-        <pixelsize>28</pixelsize>
++        <pixelsize>30</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseextralarge" from="basefont">
+-        <pixelsize>32</pixelsize>
++        <pixelsize>34</pixelsize>
+     </fontdef>
+ 
+     <fontdef name="baseextralargebold" from="basefont">
+-        <pixelsize>32</pixelsize>
++        <pixelsize>34</pixelsize>
+         <shadowcolor>#000000</shadowcolor>
+         <shadowoffset>3,3</shadowoffset>
+         <shadowalpha>100</shadowalpha>
+@@ -85,31 +85,31 @@
+     </fontdef>
+ 
+     <fontdef name="basesupersmallblue" from="basesupersmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmallblue" from="baseextrasmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="baseevensmallerblue" from="baseevensmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesomewhatsmallerblue" from="basesomewhatsmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallerblue" from="basesmaller">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallblue" from="basesmall">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumblue" from="basemedium">
+-        <color>#3a9ade</color>
++        <color>#0072bc</color>
+     </fontdef>
+ 
+     <fontdef name="basesupersmallgreen" from="basesupersmall">
+@@ -200,6 +200,10 @@
+         <color>#d97616</color>
+     </fontdef>
+ 
++    <fontdef name="basemediumorange" from="basemedium">
++        <color>#d97616</color>
++    </fontdef>
++
+     <fontdef name="baseextrasmallpurple" from="baseextrasmall">
+         <color>#9898d9</color>
+     </fontdef>
+@@ -241,55 +245,55 @@
+     </fontdef>
+ 
+     <fontdef name="basesupersmallyellow" from="basesupersmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseextrasmallyellow" from="baseextrasmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseevensmalleryellow" from="basesmaller">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmalleryellow" from="basesmaller">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmallyellow" from="basesmall">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumyellow" from="basemedium">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargeryellow" from="basemediumlarger">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baselargeyellow" from="baselarge">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baseextralargeyellow" from="baseextralarge">
+-        <color>#d9d900</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basesmalldarkyellow" from="basesmall">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumdarkyellow" from="basemedium">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="basemediumlargerdarkyellow" from="basemediumlarger">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <fontdef name="baselargedarkyellow" from="baselarge">
+-        <color>#CCCC29</color>
++        <color>#ebb81c</color>
+     </fontdef>
+ 
+     <!-- Base definition of a textarea -->
+@@ -305,7 +309,7 @@
+         <font>baseextrasmallverylightgrey</font>
+         <font state="disabled">baseextrasmalllightgrey</font>
+         <font state="error">baseextrasmallred</font>
+-        <font state="warning">baseextrasmallyellow</font>
++        <font state="warning">baseextrasmallorange</font>
+         <font state="normal">baseextrasmallverylightgrey</font>
+         <font state="running">baseextrasmallgreen</font>
+         <cutdown>yes</cutdown>
+@@ -317,7 +321,7 @@
+         <font>basesmallerverylightgrey</font>
+         <font state="disabled">basesmallerlightgrey</font>
+         <font state="error">basesmallerred</font>
+-        <font state="warning">basesmalleryellow</font>
++        <font state="warning">basesmallerorange</font>
+         <font state="normal">basesmallerverylightgrey</font>
+         <font state="running">basesmallergreen</font>
+         <cutdown>yes</cutdown>
+@@ -329,7 +333,7 @@
+         <font>basesmallverylightgrey</font>
+         <font state="disabled">basesmalllightgrey</font>
+         <font state="error">basesmallred</font>
+-        <font state="warning">basesmallyellow</font>
++        <font state="warning">basesmallorange</font>
+         <font state="normal">basesmallverylightgrey</font>
+         <font state="running">basesmallgreen</font>
+         <cutdown>yes</cutdown>
+@@ -392,9 +396,10 @@
+ 
+     <!-- Base heading definition. -->
+     <textarea name="base_heading">
+-        <area>0,0,1280,22</area>
++        <area>486,0,308,22</area>
+         <font>baseextrasmall</font>
+         <align>allcenter</align>
++        <scroll direction="horizontal" />
+         <value>Heading</value>
+     </textarea>
+ 
+@@ -411,7 +416,7 @@
+         <area>283,436,50,11</area>
+         <type>roundbox</type>
+         <fill color="#000000" alpha="200" />
+-        <cornerradius>90</cornerradius>
++        <cornerradius>5</cornerradius>
+     </shape>
+ 
+     <shape name="base_backdrop_line">
+@@ -424,7 +429,7 @@
+ 
+     <!-- Base definition of a base popup backdrop -->
+     <shape name="base_popup_backdrop" from="base_backdrop">
+-        <fill color="#000000" alpha="255" />
++        <fill color="#000000" alpha="235" />
+     </shape>
+ 
+     <!-- Base definition of a heading group -->
+@@ -481,7 +486,7 @@
+ 
+     <!-- Base denfinition of a clock -->
+     <clock name="base_clock">
+-        <area>494,698,292,22</area>
++        <area>486,698,308,22</area>
+         <font>baseextrasmall</font>
+         <template>%DATE%, %TIME%</template>
+         <align>allcenter</align>
+@@ -535,10 +540,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d6d6d6" />
+-                    <stop position="25" color="#d6d6d6" alpha="255" />
+-                    <stop position="50" color="#d6d6d6" />
+-                    <stop position="100" color="#d6d6d6" />
++                    <stop position="0" color="#0072bc" />
++                    <stop position="25" color="#0072bc" alpha="255" />
++                    <stop position="50" color="#0072bc" />
++                    <stop position="100" color="#0072bc" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -547,10 +552,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d6d6d6" />
+-                    <stop position="50" color="#d6d6d6" />
+-                    <stop position="75" color="#d6d6d6" alpha="255"/>
+-                    <stop position="100" color="#d6d6d6" />
++                    <stop position="0" color="#0072bc" />
++                    <stop position="50" color="#0072bc" />
++                    <stop position="75" color="#0072bc" alpha="255"/>
++                    <stop position="100" color="#0072bc" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -667,10 +672,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d9d900" />
+-                    <stop position="25" color="#d9d900" alpha="255" />
+-                    <stop position="50" color="#d9d900" />
+-                    <stop position="100" color="#d9d900" />
++                    <stop position="0" color="#d97616" />
++                    <stop position="25" color="#d97616" alpha="255" />
++                    <stop position="50" color="#d97616" />
++                    <stop position="100" color="#d97616" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -679,10 +684,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d9d900" />
+-                    <stop position="50" color="#d9d900" />
+-                    <stop position="75" color="#d9d900" alpha="255"/>
+-                    <stop position="100" color="#d9d900" />
++                    <stop position="0" color="#d97616" />
++                    <stop position="50" color="#d97616" />
++                    <stop position="75" color="#d97616" alpha="255"/>
++                    <stop position="100" color="#d97616" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -700,10 +705,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d6d6d6" />
+-                    <stop position="25" color="#d6d6d6" alpha="255" />
+-                    <stop position="50" color="#d6d6d6" />
+-                    <stop position="100" color="#d6d6d6" />
++                    <stop position="0" color="#0072bc" />
++                    <stop position="25" color="#0072bc" alpha="255" />
++                    <stop position="50" color="#0072bc" />
++                    <stop position="100" color="#0072bc" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -712,10 +717,10 @@
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="50">
+-                    <stop position="0" color="#d6d6d6" />
+-                    <stop position="50" color="#d6d6d6" />
+-                    <stop position="75" color="#d6d6d6" alpha="255"/>
+-                    <stop position="100" color="#d6d6d6" />
++                    <stop position="0" color="#0072bc" />
++                    <stop position="50" color="#0072bc" />
++                    <stop position="75" color="#0072bc" alpha="255"/>
++                    <stop position="100" color="#0072bc" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -863,7 +868,7 @@
+             <type>roundbox</type>
+             <fill color="#1a1a1a" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+         <shape name="select_bar_top_highlight">
+             <area>0,0,100%,2</area>
+@@ -956,7 +961,7 @@
+             <type>roundbox</type>
+             <fill color="#333333" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+      </group>
+ 
+@@ -967,7 +972,7 @@
+             <type>roundbox</type>
+             <fill color="#1a1a1a" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+         <shape name="select_bar_top_highlight">
+             <area>0,0,100%,2</area>
+@@ -1060,7 +1065,7 @@
+             <type>roundbox</type>
+             <fill color="#333333" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+      </group>
+ 
+@@ -1071,7 +1076,7 @@
+             <type>roundbox</type>
+             <fill color="#1a1a1a" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+         <shape name="select_bar_top_highlight">
+             <area>0,0,100%,2</area>
+@@ -1164,7 +1169,7 @@
+             <type>roundbox</type>
+             <fill color="#1a1a1a" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+     </group>
+ 
+@@ -1233,7 +1238,7 @@
+             <type>roundbox</type>
+             <fill color="#333333" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+      </group>
+ 
+@@ -1455,7 +1460,7 @@
+                     <area>0,0,100%,100%</area>
+                 </group>
+                 <textarea name="buttontext">
+-                    <font>basesmall</font>
++                    <font>basesmallyellow</font>
+                 </textarea>
+             </state>
+             <state name="selectedinactive" from="active">
+@@ -1564,6 +1569,9 @@
+                 <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                     <area>0,0,100%,100%</area>
+                 </group>
++                <textarea name="buttontext">
++                    <font>basesmall</font>
++                </textarea>
+                 <imagetype name="buttonarrow">
+                     <filename>images/lists_right_arrow.png</filename>
+                     <alpha>0</alpha>
+@@ -1664,6 +1672,7 @@
+                         </state>
+                     </statetype>
+                 <textarea name="buttontext" from="base_text_font_state_small">
++                    <font state="normal">basesmallyellow</font>
+                 </textarea>
+                 <statetype name="buttoncheck">
+                     <state type="off">
+@@ -1732,7 +1741,7 @@
+                     <area>15,1,100%-15,100%</area>
+                     <align>allcenter</align>
+                     <font>basemedium</font>
+-                    <font state="selected">basemedium</font>
++                    <font state="selected">basemediumyellow</font>
+                     <font state="disabled">basemediumdarkgrey</font>
+                 </textarea>
+             </state>
+@@ -1831,16 +1840,20 @@
+         <area>0,0,30,30</area>
+         <statetype name="checkstate">
+             <state type="off">
+-                <imagetype name="background">
++                <imagetype name="mark">
+                     <filename>images/unchecked.png</filename>
+                 </imagetype>
+             </state>
+-            <state type="half" />
+-            <state type="full">
++            <state type="half">
+                 <imagetype name="mark">
+                     <filename>images/checked.png</filename>
+                 </imagetype>
+             </state>
++            <state type="full">
++                <imagetype name="mark">
++                    <filename>images/checked_selected.png</filename>
++                </imagetype>
++            </state>
+         </statetype>
+         <statetype name="background">
+             <state name="active" />
+@@ -1916,6 +1929,9 @@
+                 <group name="select_bar" from="base_spinbox_select_bar_selectedactive_group">
+                     <area>0,0,100%,100%</area>
+                 </group>
++                <textarea name="buttontext">
++                    <font>basesmallyellow</font>
++                </textarea>
+             </state>
+             <state name="selectedinactive" from="active" />
+             <state name="disabled" from="active">
+@@ -1992,6 +2008,9 @@
+                 <group name="select_bar" from="base_selector_select_bar_selectedactive_group">
+                     <area>0,0,100%,100%</area>
+                 </group>
++                <textarea name="buttontext">
++                    <font>basesmallyellow</font>
++                </textarea>
+             </state>
+             <state name="selectedinactive" from="active" />
+             <state name="disabled">
+@@ -2186,7 +2205,7 @@
+         </shape>
+ 
+         <shape name="popup-seperator-line" from="base_line">
+-            <area>23,212,556,2</area>
++            <area>23,174,556,2</area>
+         </shape>
+ 
+         <shape name="popup-third-line" from="base_highlight_line">
+@@ -2202,23 +2221,23 @@
+         </shape>
+ 
+         <shape name="popup-arrows-backdrop" from="base_arrows_backdrop">
+-            <area>3,488,50,13</area>
++            <area>549,488,50,13</area>
+         </shape>
+ 
+         <textarea name="messagearea" from="basetextarea">
+-            <area>16,10,570,196</area>
+-            <font>basesmalldarkyellow</font>
++            <area>16,10,570,158</area>
++            <font>basesmall</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>     
+         </textarea>
+ 
+         <buttonlist name="list" from="base_button_list">
+-            <area>8,216,586,264</area>
++            <area>8,178,586,302</area>
+             <statetype name="buttonitem">
+                 <state name="active">
+                     <area>0,0,100%,34</area>
+                     <textarea name="buttontext">
+-                        <area>8,0,586,34</area>
++                        <area>8,0,570,34</area>
+                     </textarea>
+                     <imagetype name="buttonarrow">
+                         <position>560,8</position>
+@@ -2227,7 +2246,8 @@
+                 <state name="selectedactive">
+                     <area>0,0,100%,34</area>
+                     <textarea name="buttontext">
+-                        <area>8,0,586,34</area>
++                        <area>8,0,570,34</area>
++                        <scroll direction="horizontal" />
+                     </textarea>
+                     <imagetype name="buttonarrow">
+                         <position>560,8</position>
+@@ -2236,7 +2256,7 @@
+                 <state name="selectedinactive">
+                     <area>0,0,100%,34</area>
+                     <textarea name="buttontext">
+-                        <area>8,0,586,34</area>
++                        <area>8,0,570,34</area>
+                     </textarea>
+                     <imagetype name="buttonarrow">
+                         <position>560,8</position>
+@@ -2244,10 +2264,10 @@
+                 </state>
+             </statetype>
+         <statetype name="upscrollarrow">
+-            <position>2,274</position>
++            <position>548,312</position>
+         </statetype>
+         <statetype name="downscrollarrow">
+-            <position>22,274</position>
++            <position>568,312</position>
+         </statetype>
+         </buttonlist>
+     </window>
+@@ -2299,7 +2319,7 @@
+         </shape>
+ 
+         <shape name="large-dialogbox-arrows-backdrop" from="base_arrows_backdrop">
+-            <area>3,488,50,13</area>
++            <area>761,488,50,13</area>
+         </shape>
+ 
+         <textarea name="messagearea" from="basetextarea">
+@@ -2332,10 +2352,10 @@
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>2,198</position>
++                <position>762,198</position>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>22,198</position>
++                <position>782,198</position>
+             </statetype>
+         </buttonlist>
+     </window>
+@@ -2486,7 +2506,7 @@
+ 
+         <textarea name="message" from="basetextarea">
+             <area>8,8,571,127</area>
+-            <font>basesmalldarkyellow</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+             <cutdown>no</cutdown>
+@@ -2501,6 +2521,7 @@
+             <area>338,151,150,35</area>
+             <value>OK</value>
+         </button>
++
+     </window>
+ 
+     <!-- Popup search dialog used to search button lists -->
+@@ -2630,12 +2651,12 @@
+ 
+         <textarea name="message" from="basetextarea">
+             <area>10,14,567,36</area>
+-            <font>basesmalldarkyellow</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+         <textedit name="input" from="base_textedit">
+-            <area>150,62,287,40</area>
++            <area>50,62,487,40</area>
+         </textedit>
+ 
+         <button name="ok" from="base_button">
+@@ -2708,6 +2729,63 @@
+ 
+     </window>
+ 
++    <window name="MythSpinBoxDialog">
++        <area>-1,-1,587,178</area>
++
++        <animation trigger="AboutToShow">
++            <section>
++                <alpha start="0" end="255" easingcurve="OutQuart"/>
++                <zoom start="0" end="100" easingcurve="OutQuart"/>
++            </section>
++        </animation>
++
++        <animation trigger="AboutToHide">
++            <section>
++                <alpha start="255" end="0" easingcurve="InQuart"/>
++                <zoom start="100" end="0" easingcurve="InQuart"/>
++            </section>
++        </animation>
++
++        <shape name="Myth-spinbox-backdrop" from="base_popup_backdrop">
++            <area>0,0,587,178</area>
++        </shape>
++
++        <shape name="Myth-spinbox-backdrop-line" from="base_backdrop_line">
++            <area>1,1,585,176</area>
++        </shape>
++
++        <shape name="Myth-spinbox-dialog-top-line" from="base_highlight_line">
++            <area>2,2,583,2</area>
++        </shape>
++
++        <shape name="Myth-spinbox-dialog-bottom-line" from="base_highlight_line">
++            <area>2,174,583,2</area>
++        </shape>
++
++        <shape name="Myth-spinbox-dialog-left-line" from="base_highlight_vertical_line">
++            <area>2,4,2,170</area>
++        </shape>
++
++        <shape name="Myth-spinbox-dialog-right-line" from="base_highlight_vertical_line">
++            <area>583,4,2,170</area>
++        </shape>
++
++        <textarea name="message" from="basetextarea">
++            <area>10,14,567,36</area>
++            <font>basesmall</font>
++            <align>allcenter</align>
++        </textarea>
++
++        <spinbox name="input" from="base_spinbox">
++            <position>253,62</position>
++        </spinbox>
++
++        <button name="ok" from="base_button">
++            <area>218,124,150,35</area>
++            <value>OK</value>
++        </button>
++    </window>
++
+     <window name="MythSearchDialog">
+         <area>-1,-1,602,488</area>
+ 
+@@ -2795,10 +2873,10 @@
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>0,272</position>
++                <position>550,272</position>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>20,272</position>
++                <position>570,272</position>
+             </statetype>
+         </buttonlist>
+ 
+@@ -2813,13 +2891,84 @@
+         </button>
+     </window>
+ 
++    <!-- Popup dialog to enter into a spin box -->
++    <window name="SpinBoxEntryDialog">
++        <area>-1,-1,587,178</area>
++
++        <animation trigger="AboutToShow">
++            <section>
++                <alpha start="0" end="255" easingcurve="OutQuart"/>
++                <zoom start="0" end="100" easingcurve="OutQuart"/>
++            </section>
++        </animation>
++
++        <animation trigger="AboutToHide">
++            <section>
++                <alpha start="255" end="0" easingcurve="InQuart"/>
++                <zoom start="100" end="0" easingcurve="InQuart"/>
++            </section>
++        </animation>
++
++        <shape name="spinbox-entry-backdrop" from="base_popup_backdrop">
++            <area>0,0,587,178</area>
++        </shape>
++
++        <shape name="spinbox-entry-backdrop-line" from="base_backdrop_line">
++            <area>1,1,585,176</area>
++        </shape>
++
++        <shape name="spinbox-entry-dialog-top-line" from="base_highlight_line">
++            <area>2,2,583,2</area>
++        </shape>
++
++        <shape name="spinbox-entry-dialog-bottom-line" from="base_highlight_line">
++            <area>2,174,583,2</area>
++        </shape>
++
++        <shape name="spinbox-entry-dialog-left-line" from="base_highlight_vertical_line">
++            <area>2,4,2,170</area>
++        </shape>
++
++        <shape name="spinbox-entry-dialog-right-line" from="base_highlight_vertical_line">
++            <area>583,4,2,170</area>
++        </shape>
++<!--
++        <textarea name="title" from="basetextarea">
++            <area>10,14,567,36</area>
++            <font>basesmall</font>
++            <align>allcenter</align>
++            <value>Enter a value:</value>
++        </textarea>
++-->
++        <textarea name="rules" from="basetextarea">
++            <area>10,14,567,36</area>
++            <font>basesmall</font>
++            <align>allcenter</align>
++            <template>Enter %LOW% to %HIGH% in increments of %STEP%:</template>
++        </textarea>
++
++        <textedit name="entry" from="base_textedit">
++            <area>50,62,487,40</area>
++        </textedit>
++<!--
++        <button name="cancel" from="base_button">
++            <area>50,124,150,35</area>
++            <value>Cancel</value>
++        </button>
++-->
++        <button name="ok" from="base_button">
++            <area>218,124,150,35</area>
++            <value>OK</value>
++        </button>
++    </window>
++
+     <window name="MythFileBrowser">
+         <area>0,0,1280,720</area>
+ 
+         <group name="fanart-group" from="base_fanart_group" />
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>FileBrowser</value>
++            <value>File Browser</value>
+         </textarea>
+ 
+         <shape name="fullpath-backdrop" from="base_backdrop">
+@@ -2836,87 +2985,85 @@
+         </shape>
+ 
+         <shape name="file-browser-preview-backdrop" from="base_backdrop">
+-            <area>20,92,615,592</area>
++            <area>645,92,615,592</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-backdrop-line" from="base_backdrop_line">
+-            <area>21,93,613,590</area>
++            <area>646,93,613,590</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-top-line" from="base_highlight_line">
+-            <area>22,94,611,2</area>
++            <area>647,94,611,2</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-bottom-line" from="base_highlight_line">
+-            <area>22,680,611,2</area>
++            <area>647,680,611,2</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-left-line" from="base_highlight_vertical_line">
+-            <area>22,96,2,584</area>
++            <area>647,96,2,584</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-right-line" from="base_highlight_vertical_line">
+-            <area>631,96,2,584</area>
++            <area>1256,96,2,584</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-image-line" from="base_backdrop_line">
+-            <area>42,158,571,324</area>
++            <area>667,107,571,324</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-image-top-line" from="base_highlight_line">
+-            <area>43,159,569,2</area>
++            <area>668,108,569,2</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-image-bottom-line" from="base_highlight_line">
+-            <area>43,479,569,2</area>
++            <area>668,428,569,2</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-image-left-line" from="base_highlight_vertical_line">
+-            <area>43,161,2,318</area>
++            <area>668,110,2,318</area>
+         </shape>
+ 
+         <shape name="file-browser-preview-image-right-line" from="base_highlight_vertical_line">
+-            <area>610,161,2,318</area>
++            <area>1235,110,2,318</area>
+         </shape>
+ 
+         <shape name="file-browser-backdrop" from="base_backdrop">
+-            <area>645,92,615,592</area>
++            <area>20,92,615,592</area>
+         </shape>
+ 
+         <shape name="file-browser-backdrop-line" from="base_backdrop_line">
+-            <area>646,93,613,590</area>
++            <area>21,93,613,590</area>
+         </shape>
+ 
+         <shape name="file-browser-top-line" from="base_highlight_line">
+-            <area>647,94,611,2</area>
++            <area>22,94,611,2</area>
+         </shape>
+ 
+         <shape name="file-browser-bottom-line" from="base_highlight_line">
+-            <area>647,680,611,2</area>
++            <area>22,680,611,2</area>
+         </shape>
+ 
+         <shape name="file-browser-left-line" from="base_highlight_vertical_line">
+-            <area>647,96,2,584</area>
++            <area>22,96,2,584</area>
+         </shape>
+ 
+         <shape name="file-browser-right-line" from="base_highlight_vertical_line">
+-            <area>1256,96,2,584</area>
++            <area>631,96,2,584</area>
+         </shape>
+ 
+         <shape name="file-browser-arrows-backdrop" from="base_arrows_backdrop">
+-            <area>1207,684,50,10</area>
++            <area>582,684,50,10</area>
+         </shape>
+ 
+         <textarea name="fullpath" from="basetextarea">
+-            <area>24,39,1224,37</area>
+             <cutdown>yes</cutdown>
+-            <font>basesmallblue</font>
+-             <align>allcenter</align>
+-            <value>Filename</value>
++            <font>basesmall</font>
++            <align>allcenter</align>
+         </textarea>
+ 
+         <buttonlist name="filelist" from="base_list">
+-            <area>653,100,599,578</area>
++            <area>28,100,599,578</area>
+             <statetype name="buttonitem">
+                 <state name="active">
+                     <area>0,0,599,54</area>
+@@ -3029,52 +3176,53 @@
+         </buttonlist>
+ 
+         <textedit name="location" from="base_textedit">
+-            <area>40,107,575,40</area>
++            <area>665,446,575,40</area>
+         </textedit>
+ 
+         <imagetype name="no_preview">
+-            <area>46,161,563,318</area>
++            <area>671,110,563,318</area>
+             <filename>images/file_browser_no_preview.png</filename>
+             <mask>images/masks/file_browser_preview_mask.png</mask>
+             <preserveaspect>true</preserveaspect>
+         </imagetype>
+ 
+         <imagetype name="preview">
+-            <area>46,161,563,318</area>
++            <area>671,110,563,318</area>
+             <mask>images/masks/file_browser_preview_mask.png</mask>
+             <preserveaspect>true</preserveaspect>
+         </imagetype>
+ 
+         <button name="back" from="base_button">
+-            <area>252,493,150,35</area>
++            <area>750,560,150,35</area>
+             <value>Up Level</value>
+         </button>
+ 
+         <button name="home" from="base_button">
+-            <area>252,540,150,35</area>
++            <area>1005,560,150,35</area>
+             <value>Home</value>
+         </button>
+ 
+         <button name="cancel" from="base_button">
+-            <area>252,587,150,35</area>
++            <area>750,630,150,35</area>
+             <value>Cancel</value>
+         </button>
+ 
+         <button name="ok" from="base_button">
+-            <area>252,634,150,35</area>
++            <area>1005,630,150,35</area>
+             <value>OK</value>
+         </button>
+ 
+         <textarea name="info_label" from="basetextarea">
+-            <area>408,554,221,24</area>
+-            <align>allcenter</align>
++            <area>865,501,80,24</area>
++            <font>basesmaller</font>
++            <align>right</align>
+             <value>File Size:</value>
+         </textarea>
+ 
+         <textarea name="info" from="basetextarea">
+-            <area>408,584,221,24</area>
+-            <font>baseevensmallerblue</font>
+-            <align>allcenter</align>
++            <area>955,501,100,24</area>
++            <font>basesmaller</font>
++            <align>left</align>
+         </textarea>
+ 
+         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
+@@ -3114,7 +3262,7 @@
+             <area>14,4,552,92</area>
+             <font>basesmalldarkyellow</font>
+             <align>hcenter,bottom</align>
+-            <value>Please Wait...</value>
++            <value>Starting Playback...</value>
+         </textarea>
+ 
+         <progressbar name="progress" from="baseprogressbar">
diff --git a/linhes/linhes-theme/blank_coverart.png b/linhes/linhes-theme/blank_coverart.png
new file mode 100644
index 0000000..c44148e
Binary files /dev/null and b/linhes/linhes-theme/blank_coverart.png differ
diff --git a/linhes/linhes-theme/browser-ui.xml.patch b/linhes/linhes-theme/browser-ui.xml.patch
new file mode 100644
index 0000000..4fc4d0e
--- /dev/null
+++ b/linhes/linhes-theme/browser-ui.xml.patch
@@ -0,0 +1,69 @@
+--- browser-ui.xml.orig	2017-10-26 18:22:20.964735039 +0000
++++ browser-ui.xml	2017-10-26 18:22:03.746982358 +0000
+@@ -322,7 +322,7 @@
+ 
+         <textarea name="description" from="basetextarea">
+             <area>239,468,802,145</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+         </textarea>
+@@ -411,40 +411,50 @@
+         </textarea>
+ 
+         <textarea name="categorylabel" from="basetextarea">
+-            <area>78,101,104,40</area>
++            <area>30,101,120,40</area>
+             <align>right,vcenter</align>
+             <value>Category:</value>
+         </textarea>
+ 
+         <textedit name="category" from="base_textedit">
+-            <area>192,101,287,40</area>
++            <area>160,101,406,40</area>
+         </textedit>
+ 
+         <button name="findcategory" from="base_button">
+             <area>586,101,150,40</area>
+-            <value>Find</value>
++            <value>Find...</value>
+         </button>
+ 
+         <textarea name="namelabel" from="basetextarea">
+-            <area>50,203,100,40</area>
++            <area>50,169,100,40</area>
+             <align>right,vcenter</align>
+             <value>Name:</value>
+         </textarea>
+ 
+         <textedit name="name" from="base_textedit">
+-            <area>160,203,580,40</area>
++            <area>160,169,580,40</area>
+         </textedit>
+ 
+         <textarea name="urllabel" from="basetextarea">
+-            <area>50,305,100,40</area>
++            <area>50,237,100,40</area>
+             <align>right,vcenter</align>
+             <value>URL:</value>
+         </textarea>
+ 
+         <textedit name="url" from="base_textedit">
+-            <area>160,305,580,40</area>
++            <area>160,237,580,40</area>
+         </textedit>
+ 
++        <textarea name="homepagelabel" from="basetextarea">
++            <area>30,305,120,40</area>
++            <align>right,vcenter</align>
++            <value>Homepage:</value>
++        </textarea>
++
++        <checkbox name="homepage" from="base_checkbox">
++            <position>160,310</position>
++        </checkbox>
++
+         <button name="cancel" from="base_button">
+             <area>38,443,350,40</area>
+             <value>Cancel</value>
diff --git a/linhes/linhes-theme/bubble_background.png b/linhes/linhes-theme/bubble_background.png
new file mode 100644
index 0000000..28d83f1
Binary files /dev/null and b/linhes/linhes-theme/bubble_background.png differ
diff --git a/linhes/linhes-theme/checkmark.png b/linhes/linhes-theme/checkmark.png
new file mode 100644
index 0000000..0c8ba2d
Binary files /dev/null and b/linhes/linhes-theme/checkmark.png differ
diff --git a/linhes/linhes-theme/config-ui.xml.patch b/linhes/linhes-theme/config-ui.xml.patch
new file mode 100644
index 0000000..6203f79
--- /dev/null
+++ b/linhes/linhes-theme/config-ui.xml.patch
@@ -0,0 +1,673 @@
+--- config-ui.xml.orig	2018-04-17 14:44:54.355990144 +0000
++++ config-ui.xml	2018-04-17 21:15:29.208674746 +0000
+@@ -151,7 +151,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Edit Channels</value>
++            <value>Channel Editor</value>
+         </textarea>
+ 
+         <shape name="edit-channels-top-backdrop" from="base_backdrop">
+@@ -261,13 +261,7 @@
+                         <align>right,vcenter</align>
+                     </textarea>
+                 </state>
+-                <state name="selectedinactive" from="selectedactive">
+-                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
+-                        <area>0,0,100%,100%</area>
+-                        <shape name="select_bar_bottom_highlight">
+-                            <area>0,70,100%,2</area>
+-                        </shape>
+-                    </group>
++                <state name="selectedinactive" from="active">
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+@@ -301,7 +295,7 @@
+         </textarea>
+ 
+         <buttonlist name="sorting" from="base_selector">
+-            <area>415,460,580,40</area>
++            <area>415,460,560,40</area>
+         </buttonlist>
+ 
+         <textarea name="sourcelabel" from="sortlabel">
+@@ -310,21 +304,21 @@
+         </textarea>
+ 
+         <buttonlist name="source" from="sorting">
+-            <area>415,515,580,40</area>
++            <area>415,515,560,40</area>
+         </buttonlist>
+ 
+         <button name="delete" from="base_button">
+-            <area>1030,517,150,35</area>
+-            <value>Delete</value>
++            <area>1010,517,200,35</area>
++            <value>Delete Source</value>
+         </button>
+ 
+-        <textarea name="nochannumlabel" from="basetextarea">
+-            <area>450,575,500,60</area>
+-            <value>Hide Channels without channel number.</value>
++        <textarea name="nochannumlabel" from="sortlabel">
++            <area>245,575,425,30</area>
++            <value>Hide Channels Without Channel Number:</value>
+         </textarea>
+ 
+         <checkbox name="nochannum" from="base_checkbox">
+-            <position>410,572</position>
++            <position>685,575</position>
+         </checkbox>
+ 
+         <button name="scan" from="base_button">
+@@ -645,7 +639,7 @@
+         <textarea name="helptext" from="basetextarea">
+             <area>231,372,818,227</area>
+             <multiline>yes</multiline>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -734,7 +728,7 @@
+         <textarea name="helptext" from="basetextarea">
+             <area>231,372,818,227</area>
+             <multiline>yes</multiline>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -901,7 +895,7 @@
+         <textarea name="helptext" from="basetextarea">
+             <area>233,488,814,111</area>
+             <multiline>yes</multiline>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -1000,7 +994,7 @@
+         <textarea name="helptext" from="basetextarea">
+             <area>231,372,818,227</area>
+             <multiline>yes</multiline>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -1016,4 +1010,572 @@
+ 
+     </window>
+ 
++    <window name="backendselection">
++
++        <textarea name="heading" from="base_heading">
++            <value>MythTV Servers</value>
++        </textarea>
++
++        <shape name="beconnect-backdrop" from="base_backdrop">
++            <area>115,36,1050,649</area>
++        </shape>
++
++        <shape name="beconnect-backdrop-line" from="base_backdrop_line">
++            <area>116,37,1048,500</area>
++        </shape>
++
++        <shape name="beconnect-top-line" from="base_highlight_line">
++            <area>117,38,1046,2</area>
++        </shape>
++
++        <shape name="beconnect-bottom-line" from="base_highlight_line">
++            <area>117,534,1046,2</area>
++        </shape>
++
++        <shape name="beconnect-left-line" from="base_highlight_vertical_line">
++            <area>117,40,2,494</area>
++        </shape>
++
++        <shape name="beconnect-right-line" from="base_highlight_vertical_line">
++            <area>1161,40,2,494</area>
++        </shape>
++
++        <shape name="beconnect-bottom-backdrop-line" from="base_backdrop_line">
++            <area>116,547,1048,137</area>
++        </shape>
++
++        <shape name="beconnect-bottom-top-line" from="base_highlight_line">
++            <area>117,548,1046,2</area>
++        </shape>
++
++        <shape name="beconnect-bottom-bottom-line" from="base_highlight_line">
++            <area>117,681,1046,2</area>
++        </shape>
++
++        <shape name="beconnect-bottom-left-line" from="base_highlight_vertical_line">
++            <area>117,550,2,131</area>
++        </shape>
++
++        <shape name="beconnect-bottom-right-line" from="base_highlight_vertical_line">
++            <area>1161,550,2,131</area>
++        </shape>
++
++        <shape name="beconnect-bottom-seperator-first-line" from="base_line">
++            <area>138,620,1004,2</area>
++        </shape>
++
++        <buttonlist name="backends" from="base_list_state">
++            <area>123,44,1034,494</area>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <area>0,0,1034,30</area>
++                    <group name="select_bar" from="base_select_bar_active_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                    <textarea name="buttontext" from="basetextarea">
++                        <area>8,0,420,100%</area>
++                        <align>left,vcenter</align>
++                    </textarea>
++                    <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug -->
++                    <textarea name="protocollabel" from="buttontext" depends="protocolversion">
++                        <area>432,0,100,100%</area>
++                        <cutdown>yes</cutdown>
++                        <align>right,vcenter</align>
++                        <value>Protocol:</value>
++                        <font>basesmallerblue</font>
++                    </textarea>
++                    <textarea name="protocolversion" from="buttontext">
++                        <area>538,0,50,100%</area>
++                        <cutdown>yes</cutdown>
++                        <align>left,vcenter</align>
++                        <font>basesmaller</font>
++                    </textarea>
++                    <textarea name="versionlabel" from="protocollabel" depends="version">
++                        <area>596,0,100,100%</area>
++                        <value>Version:</value>
++                    </textarea>
++                    <textarea name="version" from="protocolversion">
++                        <area>704,0,242,100%</area>
++                    </textarea>
++                    <statetype name="connection">
++                        <area>8,0,100%-8,100%</area>
++                        <state name="good">
++                            <area>0,0,100%,100%</area>
++                        </state>
++                        <state name="protocolmismatch">
++                            <area>0,0,100%,100%</area>
++                            <textarea name="description">
++                                <area>0,0,100%,100%</area>
++                                <align>allcenter</align>
++                                <value>Version Mismatch Between Client and Server</value>
++                                <font>basesmallred</font>
++                            </textarea>
++                        </state>
++                        <state name="blocked" from="protocolmismatch">
++                            <textarea name="description">
++                                <area>0,0,100%,100%</area>
++                                <align>allcenter</align>
++                                <value>Firewall is Blocking the Server</value>
++                                <font>basesmallred</font>
++                            </textarea>
++                        </state>
++                    </statetype>
++                    <statetype name="securitypin">
++                        <area>946,0,80,100%</area>
++                        <state name="yes">
++                            <area>0,0,80,100%</area>
++                            <textarea name="description">
++                                <area>0,0,80,100%</area>
++                                <align>allcenter</align>
++                                <value>LOCKED</value>
++                                <font>basesupersmallred</font>
++                            </textarea>
++                        </state>
++                        <state name="no" from="yes">
++                            <textarea name="description">
++                                <value>UNLOCKED</value>
++                                <font>basesupersmallgreen</font>
++                            </textarea>
++                        </state>
++                    </statetype>
++                </state>
++                <state name="inactive" from="active" />
++                <state name="selectedactive" from="active">
++                    <area>0,0,1034,64</area>
++                    <group name="select_bar" from="base_select_bar_selectedactive_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                    <textarea name="buttontext" from="basetextarea">
++                        <area>8,0,420,100%</area>
++                        <align>left,vcenter</align>
++                        <font>basesmallyellow</font>
++                    </textarea>
++                    <textarea name="modelname" from="buttontext" /> <!-- Workaround for vanishing buttontext bug -->
++                    <textarea name="protocolversion" from="buttontext">
++                        <area>538,0,50,100%</area>
++                        <cutdown>yes</cutdown>
++                        <align>left,vcenter</align>
++                        <font>basesmalleryellow</font>
++                    </textarea>
++                    <textarea name="version" from="protocolversion">
++                        <area>704,0,242,100%</area>
++                    </textarea>
++                </state>
++                <state name="selectedinactive" from="selectedactive">
++                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                </state>
++            </statetype>
++            <statetype name="upscrollarrow">
++                <position>998,494</position>
++            </statetype>
++            <statetype name="downscrollarrow">
++                <position>1018,494</position>
++            </statetype>
++            <helptext>Select a server.</helptext>
++        </buttonlist>
++
++        <textarea name="helptext" from="basetextarea">
++            <area>139,552,1003,66</area>
++            <font>basesmaller</font>
++            <cutdown>yes</cutdown>
++            <align>allcenter</align>
++            <multiline>yes</multiline>
++        </textarea>
++        <button name="cancel" from="base_button">
++            <area>265,632,150,40</area>
++            <value>Cancel</value>
++            <helptext>Close without saving the selected server.</helptext>
++        </button>
++        <button name="manual" from="base_button">
++            <area>565,632,150,40</area>
++            <value>Manual</value>
++            <helptext>Manually select a server.</helptext>
++        </button>
++        <button name="save" from="base_button">
++            <area>865,632,150,40</area>
++            <value>Save</value>
++            <helptext>Save the selected server.</helptext>
++        </button>
++    </window>
++
++    <window name="guistartup">
++
++        <textarea name="heading" from="base_heading">
++            <value>MythTV Startup Status</value>
++        </textarea>
++
++        <shape name="startup-backdrop" from="base_backdrop">
++            <area>115,36,1050,649</area>
++        </shape>
++
++        <shape name="startup-backdrop-line" from="base_backdrop_line">
++            <area>116,37,1048,506</area>
++        </shape>
++
++        <shape name="startup-top-line" from="base_highlight_line">
++            <area>117,38,1046,2</area>
++        </shape>
++
++        <shape name="startup-bottom-line" from="base_highlight_line">
++            <area>117,540,1046,2</area>
++        </shape>
++
++        <shape name="startup-left-line" from="base_highlight_vertical_line">
++            <area>117,40,2,500</area>
++        </shape>
++
++        <shape name="startup-right-line" from="base_highlight_vertical_line">
++            <area>1161,40,2,500</area>
++        </shape>
++
++        <shape name="startup-bottom-backdrop-line" from="base_backdrop_line">
++            <area>116,547,1048,137</area>
++        </shape>
++
++        <shape name="startup-bottom-top-line" from="base_highlight_line">
++            <area>117,548,1046,2</area>
++        </shape>
++
++        <shape name="startup-bottom-bottom-line" from="base_highlight_line">
++            <area>117,681,1046,2</area>
++        </shape>
++
++        <shape name="startup-bottom-left-line" from="base_highlight_vertical_line">
++            <area>117,550,2,131</area>
++        </shape>
++
++        <shape name="startup-bottom-right-line" from="base_highlight_vertical_line">
++            <area>1161,550,2,131</area>
++        </shape>
++
++        <shape name="startup-bottom-seperator-first-line" from="base_line">
++            <area>138,620,1004,2</area>
++        </shape>
++
++        <progressbar name="progress" from="baseprogressbar">
++            <position>372,214</position>
++        </progressbar>
++
++        <statetype name="statusstate">
++            <area>129,255,1022,40</area>
++            <state name="start">
++                <area>0,0,1022,40</area>
++                <textarea name="status" from="basetextarea">
++                    <area>0,0,1022,40</area>
++                    <font>basemedium</font>
++                    <align>allcenter</align>
++                    <value>Waking up Database Machine</value>
++                    <multiline>true</multiline>
++                </textarea>
++            </state>
++            <state name="startFail" from="start">
++                <textarea name="status">
++                    <value>Database Machine Failed to Wake Up</value>
++                </textarea>
++            </state>
++            <state name="dbAwake" from="start">
++                <textarea name="status">
++                    <value>Waiting for Database to Start</value>
++                </textarea>
++            </state>
++            <state name="dbAwakeFail" from="start">
++                <textarea name="status">
++                    <value>Database Failed to Start</value>
++                </textarea>
++            </state>
++            <state name="dbStarted" from="start">
++                <textarea name="status">
++                    <value>Attempting to Connect to Database</value>
++                </textarea>
++            </state>
++            <state name="dbStartedFail" from="start">
++                <textarea name="status">
++                    <value>Unable to Connect to Database</value>
++                </textarea>
++            </state>
++            <state name="beWOL" from="start">
++                <textarea name="status">
++                    <value>Attempting to Wake Master Backend</value>
++                </textarea>
++            </state>
++            <state name="beWOLFail" from="start">
++                <textarea name="status">
++                    <value>Master Backend Failed to Wake</value>
++                </textarea>
++            </state>
++            <state name="beAwake" from="start">
++                <textarea name="status">
++                    <value>Attempting to Connect to Master Backend</value>
++                </textarea>
++            </state>
++            <state name="beAwakeFail" from="start">
++                <textarea name="status">
++                    <value>Unable to Connect to Master Backend</value>
++                </textarea>
++            </state>
++        </statetype>
++
++        <statetype name="messagestate">
++            <area>129,316,1022,40</area>
++            <state name="makeselection">
++                <area>0,0,100%,100%</area>
++                <textarea name="message" from="basetextarea">
++                    <area>0,0,100%,100%</area>
++                    <font>basemedium</font>
++                    <align>allcenter</align>
++                    <value></value>
++                    <multiline>true</multiline>
++                </textarea>
++            </state>
++            <state name="empty" from="makeselection">
++                <textarea name="message">
++                    <value></value>
++                </textarea>
++            </state>
++        </statetype>
++
++        <textarea name="helptext" from="basetextarea">
++            <area>139,552,1003,66</area>
++            <font>basesmaller</font>
++            <cutdown>yes</cutdown>
++            <align>allcenter</align>
++            <multiline>yes</multiline>
++        </textarea>
++
++        <button name="dummy" from="base_button">
++            <area>0%,80%,0,0</area>
++            <value></value>
++            <helptext></helptext>
++        </button>
++
++        <button name="retry" from="base_button">
++            <area>205,632,150,40</area>
++            <value>Retry</value>
++            <helptext>Try again to establish connections.</helptext>
++        </button>
++
++        <button name="search" from="base_button">
++            <area>445,632,150,40</area>
++            <value>Search</value>
++            <helptext>Search the local network for the MythTV Backend.</helptext>
++        </button>
++
++        <button name="setup" from="base_button">
++            <area>685,632,150,40</area>
++            <value>Setup</value>
++            <helptext>Use Database setup to enter database parameters.</helptext>
++        </button>
++
++        <button name="exit" from="base_button">
++            <area>925,632,150,40</area>
++            <value>Exit</value>
++            <helptext>Exit from MythTV.</helptext>
++        </button>
++    </window>
++
++    <window name="channelscanner">
++        <area>0,0,1280,720</area>
++
++        <textarea name="heading" from="base_heading">
++            <value>Channel Scanner</value>
++        </textarea>
++
++        <shape name="status-backdrop" from="base_backdrop">
++            <area>0,37,1280,44</area>
++            <type>box</type>
++        </shape>
++
++        <shape name="status-top-line" from="base_line">
++            <area>0,38,1280,2</area>
++        </shape>
++
++        <shape name="status-bottom-line" from="base_line">
++            <area>0,77,1280,2</area>
++        </shape>
++
++        <shape name="scanner-progress-backdrop" from="base_backdrop">
++            <area>645,92,615,592</area>
++        </shape>
++
++        <shape name="scanner-progress-backdrop-line" from="base_backdrop_line">
++            <area>646,93,613,590</area>
++        </shape>
++
++        <shape name="scanner-progress-top-line" from="base_highlight_line">
++            <area>647,94,611,2</area>
++        </shape>
++
++        <shape name="scanner-progress-bottom-line" from="base_highlight_line">
++            <area>647,680,611,2</area>
++        </shape>
++
++        <shape name="scanner-progress-left-line" from="base_highlight_vertical_line">
++            <area>647,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-progress-right-line" from="base_highlight_vertical_line">
++            <area>1256,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-backdrop" from="base_backdrop">
++            <area>20,92,615,592</area>
++        </shape>
++
++        <shape name="scanner-channels-backdrop-line" from="base_backdrop_line">
++            <area>21,93,613,590</area>
++        </shape>
++
++        <shape name="scanner-channels-top-line" from="base_highlight_line">
++            <area>22,94,611,2</area>
++        </shape>
++
++        <shape name="scanner-channels-bottom-line" from="base_highlight_line">
++            <area>22,680,611,2</area>
++        </shape>
++
++        <shape name="scanner-channels-left-line" from="base_highlight_vertical_line">
++            <area>22,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-right-line" from="base_highlight_vertical_line">
++            <area>631,96,2,584</area>
++        </shape>
++
++        <shape name="scanner-channels-arrows-backdrop" from="base_arrows_backdrop">
++            <area>1207,684,50,10</area>
++        </shape>
++
++        <textarea name="status">
++            <area>265,39,460,40</area>
++            <font>basesmall</font>
++            <align>right,vcenter</align>
++            <template>%1</template>
++        </textarea>
++
++        <textarea name="signallock" from="status">
++            <area>735,39,300,40</area>
++            <align>left,vcenter</align>
++            <template>[%1]</template>
++        </textarea>
++
++        <textarea name="scanprogresstext" from="status">
++            <area>945,39,300,40</area>
++            <template>Channels%1</template>
++        </textarea>
++
++        <textarea name="progress_label">
++            <area>60,190,535,30</area>
++            <font>basesmall</font>
++            <align>left,vcenter</align>
++            <value>Scan Progress</value>
++        </textarea>
++
++        <textarea name="progresstext" from="progress_label">
++            <area>60,240,535,30</area>
++            <font>basesmall</font>
++            <align>allcenter</align>
++        </textarea>
++
++        <progressbar name="scanprogress" from="baseprogressbar">
++            <position>60,225</position>
++        </progressbar>
++
++        <group name="noisegroup" depends="signalnoise">
++            <area>60,300,535,200</area>
++            <textarea name="signalnoise_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Signal/Noise</value>
++            </textarea>
++            <textarea name="signalnoisetext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="signalnoise" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <group name="strengthgroup" depends="signalstrength">
++            <area>60,400,535,200</area>
++            <textarea name="signalstrength_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Signal Strength</value>
++            </textarea>
++            <textarea name="signalstrengthtext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="signalstrength" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <group name="rotatorgroup" depends="rotorprogress">
++            <area>60,500,535,200</area>
++            <textarea name="rotorprogress_label">
++                <area>0,0,100%,30</area>
++                <align>left,vcenter</align>
++                <font>basesmall</font>
++                <value>Rotor Movement</value>
++            </textarea>
++            <textarea name="rotatorprogresstext">
++                <area>0,50,100%,30</area>
++                <font>basesmall</font>
++                <align>allcenter</align>
++            </textarea>
++            <progressbar name="rotorprogress" from="smallprogressbar">
++                <position>0,35</position>
++            </progressbar>
++        </group>
++
++        <buttonlist name="log" from="base_list">
++            <area>653,100,599,578</area>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <area>0,0,599,54</area>
++                    <textarea name="buttontext">
++                        <area>0,0,100%,100%</area>
++                        <font>basesmaller</font>
++                        <multiline>yes</multiline>
++                        <align>allcenter</align>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active">
++                    <area>0,0,599,112</area>
++                    <group name="select_bar" from="base_select_bar_selectedactive_group">
++                        <area>0,0,100%,100%</area>
++                        <shape name="select_bar_bottom_highlight">
++                            <area>0,110,100%,2</area>
++                        </shape>
++                    </group>
++                    <textarea name="buttontext">
++                        <font>basesmalleryellow</font>
++                    </textarea>
++                </state>
++                <state name="selectedinactive" from="selectedactive">
++                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
++                        <area>0,0,100%,100%</area>
++                        <shape name="select_bar_bottom_highlight">
++                            <area>0,110,100%,2</area>
++                        </shape>
++                    </group>
++                </state>
++            </statetype>
++            <statetype name="upscrollarrow">
++                <position>561,585</position>
++            </statetype>
++            <statetype name="downscrollarrow">
++                <position>581,585</position>
++            </statetype>
++        </buttonlist>
++    </window>
++
+ </mythuitheme>
diff --git a/linhes/linhes-theme/controls-ui.xml.patch b/linhes/linhes-theme/controls-ui.xml.patch
new file mode 100644
index 0000000..2e20aa5
--- /dev/null
+++ b/linhes/linhes-theme/controls-ui.xml.patch
@@ -0,0 +1,20 @@
+--- controls-ui.xml.orig	2016-12-13 20:38:02.325765836 +0000
++++ controls-ui.xml	2017-10-26 17:04:02.966374691 +0000
+@@ -73,7 +73,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Edit keys</value>
++            <value>Edit Keys</value>
+         </textarea>
+ 
+         <shape name="edit-keys-backdrop" from="base_backdrop">
+@@ -225,7 +225,7 @@
+ 
+         <textarea name="description" from="basetextarea">
+             <area>229,510,822,84</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+         </textarea>
diff --git a/linhes/linhes-theme/error.png b/linhes/linhes-theme/error.png
new file mode 100644
index 0000000..d5ccc2d
Binary files /dev/null and b/linhes/linhes-theme/error.png differ
diff --git a/linhes/linhes-theme/gears.png b/linhes/linhes-theme/gears.png
new file mode 100644
index 0000000..b2f78d6
Binary files /dev/null and b/linhes/linhes-theme/gears.png differ
diff --git a/linhes/linhes-theme/gg-left-arrow-large.png b/linhes/linhes-theme/gg-left-arrow-large.png
new file mode 100644
index 0000000..7d44070
Binary files /dev/null and b/linhes/linhes-theme/gg-left-arrow-large.png differ
diff --git a/linhes/linhes-theme/gg-right-arrow-large.png b/linhes/linhes-theme/gg-right-arrow-large.png
new file mode 100644
index 0000000..8ff318a
Binary files /dev/null and b/linhes/linhes-theme/gg-right-arrow-large.png differ
diff --git a/linhes/linhes-theme/image-ui.xml b/linhes/linhes-theme/image-ui.xml
new file mode 100644
index 0000000..2e4f996
--- /dev/null
+++ b/linhes/linhes-theme/image-ui.xml
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+<mythuitheme>
+    <!-- A gallery button showing a picture, video or folder -->
+    <window name="gallery">
+
+        <textarea name="heading" from="base_heading">
+            <value>Image Gallery</value>
+        </textarea>
+
+        <shape name="help-instr-backdrop" from="base_backdrop">
+            <area>0,36,1280,40</area>
+            <type>box</type>
+        </shape>
+
+        <shape name="help-instr-top-line" from="base_line">
+            <area>0,37,1280,2</area>
+        </shape>
+
+        <shape name="help-instr-bottom-line" from="base_line">
+            <area>0,73,1280,2</area>
+        </shape>
+
+        <shape name="arrows-backdrop" from="base_backdrop">
+            <area>1215,697,50,20</area>
+        </shape>
+
+        <!--shows path to current image -->
+        <textarea name="breadcrumbs">
+            <area>110,39,900,34</area>
+            <font>basesmallyellow</font>
+            <cutdown>no</cutdown>
+            <scroll direction="horizontal" startdelay="0" returndelay="0"/>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <!-- shows current position in grid eg '1/123' -->
+        <textarea name="position" from="basetextarea">
+            <area>15,39,100,34</area>
+            <font>basesmall</font>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <!-- Mandatory: the image list 10 columns x 6 rows -->
+        <buttonlist name="images0">
+            <area>15,80,100%-10,100%-30</area>
+            <buttonarea>0,15,100%,100%-10</buttonarea>
+            <wrapstyle>flowing</wrapstyle>
+            <layout>grid</layout>
+            <arrange>fixed</arrange>
+            <align>allcenter</align>
+            <spacing>0</spacing>  <!-- (100% - 10*10%) / (10-1) or 0% -->
+            <statetype name="buttonitem">
+                <area>0,0,100%,100%</area>
+                <state name="active">
+                    <area>0,0,10%,16%</area>
+                    <shape name="buttonbackground" from="base_backdrop">
+                        <area>0,0,100%,100%</area>
+                    </shape>
+                    <shape name="buttonbackground-line" from="base_backdrop_line">
+                        <area>1%,1%,99%,99%</area>
+                    </shape>
+                    <!-- Shows a picture image -->
+                    <imagetype name="buttonimage">
+                        <area>4%,4%,96%,96%</area>
+                        <preserveaspect>yes</preserveaspect>
+                    </imagetype>
+                    <!-- Shows a single folder image -->
+                    <imagetype name="folderimage" from="buttonimage">
+                    </imagetype>
+                    <!-- Shows image for default folder -->
+                    <imagetype name="thumbimage0" from="buttonimage">
+                    </imagetype>
+                    <!-- Shows a video image -->
+                    <imagetype name="videoimage"  from="buttonimage">
+                    </imagetype>
+                    <!-- Show a background image depending on node type -->
+                    <statetype name="buttontype">
+                        <area>0,0,100%,100%</area>
+                        <state name="subfolder">
+                            <area>0,0,100%,100%</area>
+                            <imagetype name="background">
+                                <area>30%,30%,55%,55%</area>
+                                <filename>images/folderclosed.png</filename>
+                                <preserveaspect>yes</preserveaspect>
+                            </imagetype>
+                        </state>
+                        <state name="device" from="subfolder"/>
+                        <state name="image">
+                            <area>0,0,100%,100%</area>
+                            <imagetype name="background">
+                                <area>0,0,100%,100%</area>
+                                <filename>images/image_gallery_no_image</filename>
+                                <alpha>64</alpha>
+                            </imagetype>
+                        </state>
+                        <state name="video">
+                            <area>0,0,50%,50%</area>
+                            <imagetype name="background">
+                                <area>0,0,100%,100%</area>
+                                <filename>images/no_preview_with_fanart.png</filename>
+                                <preserveaspect>yes</preserveaspect>
+                            </imagetype>
+                        </state>
+                    </statetype>
+                    <!-- Show how many images / directories are in this directory -->
+                    <textarea name="childcount">
+                        <area>0,0,100%,100%</area>
+                        <font>baseextrasmall</font>
+                        <align>allcenter</align>
+                    </textarea>
+                    <!-- Show up arrow on parent dir with ancestors -->
+                    <statetype name="parenttype">
+                        <area>0,0,100%,100%</area>
+                        <state name="upfolder">
+                            <area>0,0,100%,100%</area>
+                            <imagetype name="icon">
+                                <area>30%,30%,55%,55%</area>
+                                <filename>images/mv_gallery_dir_up.png</filename>
+                                <preserveaspect>yes</preserveaspect>
+                            </imagetype>
+                        </state>
+                    </statetype>
+                    <!-- Darken hidden files/ folders -->
+                    <statetype name="buttonstate">
+                        <area>0,0,100%,100%</area>
+                        <state name="visible"/>
+                        <state name="hidden">
+                            <area>0,0,100%,100%</area>
+                            <shape name="hidden_background_shape">
+                                <area>0,0,100%,100%</area>
+                                <type>box</type>
+                                <fill color="#000000" alpha="128"/>
+                            </shape>
+                        </state>
+                    </statetype>
+                    <!-- Shows that the image was marked/selected and
+                    might be manipulated with other images -->
+                    <statetype name="buttoncheck">
+                        <area>0,0,100%,100%</area>
+                        <state type="full">
+                            <area>70%,5%,76%,26%</area>
+                            <shape name="marked_background">
+                                <area>0,0,100%,100%</area>
+                                <type>ellipse</type>
+                                <fill color="#000000"/>
+                            </shape>
+                            <imagetype name="marked">
+                                <area>4%,4%,96%,96%</area>
+                                <filename>images/checkmark.png</filename>
+                                <preserveaspect>no</preserveaspect>
+                            </imagetype>
+                        </state>
+                    </statetype>
+                    <shape name="buttontext-backdrop" from="base_backdrop" depends="buttontext">
+                        <area>3%,97%-22,97%,22</area>
+                        <type>roundbox</type>
+                        <cornerradius>4</cornerradius>
+                    </shape>                   
+                    <textarea name="buttontext">
+                        <area>2%,97%-22,97%,22</area>
+                        <font>baseextrasmall</font>
+                        <align>allcenter</align>
+                    </textarea>
+                </state>
+
+                <state name="selectedactive" from="active">
+                    <area>-8,-8,10%+16,16%+16</area>
+                    <shape name="buttonbackground">
+                        <area>0,0,100%,100%</area>
+                        <type>roundbox</type>
+                        <fill color="#101017" alpha="255" />
+                        <cornerradius>8</cornerradius>
+                    </shape>
+                    <shape name="buttonbackground-line">
+                        <area>0,0,100%,100%</area>
+                        <type>roundbox</type>
+                        <fill color="#000000" alpha="0" />
+                        <line color="#0072bc" alpha="45" width="4" />
+                        <cornerradius>8</cornerradius>
+                    </shape>
+                    <shape name="buttonbackground-top-highlight-line">
+                        <area>8%,0,92%,4</area>
+                         <type>box</type>
+                        <fill style="gradient">
+                            <gradient direction="horizontal" alpha="0">
+                                <stop position="0" color="#0072bc" />
+                                <stop position="50" color="#0072bc" alpha="180" />
+                                <stop position="100" color="#0072bc" />
+                            </gradient>
+                        </fill>
+                    </shape>
+                    <shape name="buttonbackground-bottom-highlight-line" from="buttonbackground-top-highlight-line">
+                        <area>8%,100%-4,92%,4</area>
+                    </shape>
+                    <shape name="buttonbackground-left-highlight-line">
+                        <area>0,8%,4,92%</area>
+                        <type>box</type>
+                        <fill style="gradient">
+                            <gradient alpha="0" direction="vertical">
+                                <stop position="0" color="#0072bc" />
+                                <stop position="50" color="#0072bc" alpha="220" />
+                                <stop position="100" color="#0072bc" />
+                            </gradient>
+                        </fill>
+                    </shape>
+                    <shape name="buttonbackground-right-highlight-line" from="buttonbackground-left-highlight-line">
+                        <area>100%-4,8%,4,92%</area>
+                    </shape>
+
+                    <statetype name="buttontype" depends="!parenttype">
+                        <area>0,0,100%,100%</area>
+                        <state name="subfolder">
+                            <area>0,0,100%,100%</area>
+                            <imagetype name="background">
+                                <area>30%,30%,55%,55%</area>
+                                <filename>images/folderopen.png</filename>
+                                <preserveaspect>yes</preserveaspect>
+                            </imagetype>
+                        </state>
+                    </statetype>
+
+                    <!-- Show up arrow on parent dir with ancestors -->
+                    <statetype name="parenttype">
+                        <state name="upfolder">
+                            <imagetype name="icon">
+                                <filename>images/mv_gallery_dir_up_open.png</filename>
+                            </imagetype>
+                        </state>
+                    </statetype>
+                    <!-- Show how many images / directories are in this directory -->
+                    <textarea name="childcount">
+                        <font>baseextrasmallyellow</font>
+                    </textarea>
+                    <textarea name="buttontext">
+                        <area>2%,97%-22,97%,22</area>
+                        <font>baseextrasmallyellow</font>
+                        <align>allcenter</align>
+                    </textarea>
+                </state>
+
+                <state name="inactive" from="active"/>
+
+                <state name="selectedinactive" from="active"/>
+            </statetype>
+
+            <statetype name="upscrollarrow">
+                <position>1207,623</position>
+                <state type="off">
+                    <imagetype name="upoff">
+                        <filename>images/lists_up_arrow.png</filename>
+                        <alpha>80</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="upon">
+                        <filename>images/lists_up_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>1227,623</position>
+                <state type="off">
+                    <imagetype name="dnoff">
+                        <filename>images/lists_down_arrow.png</filename>
+                        <alpha>80</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="dnon">
+                        <filename>images/lists_down_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+
+        </buttonlist>
+
+        <!-- the image list 8 columns x 4 rows -->
+        <buttonlist name="images1" from="images0">
+            <spacing>7</spacing>  <!-- (100% - 8*12%) / (8-1) or 0.57% -->
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,12%,24%</area>
+                </state>
+                <state name="selectedactive">
+                    <area>-8,-8,12%+16,24%+16</area>
+                </state>
+            </statetype>
+        </buttonlist>
+
+        <!-- the image list 6 columns x 3 rows -->
+        <buttonlist name="images2" from="images0">
+            <spacing>10</spacing>  <!-- (100% - 6*16%) / (6-1) or 0.8% -->
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,16%,32%</area>
+                </state>
+                <state name="selectedactive">
+                    <area>-10,-12,16%+20,32%+20</area>
+                </state>
+            </statetype>
+        </buttonlist>
+
+        <!-- the image list 4 columns x 2 rows -->
+        <buttonlist name="images3" from="images0">
+            <spacing>0</spacing>  <!-- (100% - 4*25%) / (4-1) or 0% -->
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,25%,50%</area>
+                </state>
+                <state name="selectedactive">
+                    <area>-9,-9,25%+16,50%+10</area>
+                </state>
+            </statetype>
+        </buttonlist>
+
+        <!-- shows a message when no images are available
+             in the current directory -->
+        <textarea name="noimages" from="basetextarea">
+            <area>20,76,1240,589</area>
+            <font>basemedium</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <!-- Mandatory: Shows file info overlay -->
+        <buttonlist name="infolist" from="base_list">
+            <area>10,80,510,100%-30</area>
+            <layout>vertical</layout>
+            <spacing>0</spacing>
+            <scrollstyle>free</scrollstyle>
+            <arrange>stack</arrange>
+            <wrapstyle>items</wrapstyle>
+            <align>center</align>
+            <buttonarea>0,0,100%,100%</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,100%,30</area>
+                    <group name="select_bar" from="base_select_bar_active_group">
+                        <area>0,0,100%,100%</area>
+                        <shape name="select_bar">
+                            <fill color="#000000" alpha="210" />
+                            <type>box</type>
+                        </shape>
+                    </group>
+                    <textarea name="name" from="basetextarea">
+                        <area>10,0,100%-10,30</area>
+                        <scroll direction="left" />
+                        <cutdown>yes</cutdown>
+                        <template>%NAME%: %VALUE%</template>
+                    </textarea>
+                </state>
+                <state name="selectedactive" from="active" />
+                <state name="selectedinactive" from="active" />
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>20,-15</position>
+                <state type="off">
+                    <imagetype name="upoff">
+                        <alpha>0</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="upon">
+                        <filename>images/lists_up_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>20,100%+10</position>
+                <state type="off">
+                    <imagetype name="dnoff">
+                        <alpha>0</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="dnon">
+                        <filename>images/lists_down_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+        </buttonlist>
+
+        <!--Shows scan progress-->
+        <group name="progress">
+            <area>0,0,100%,100%</area>
+
+            <animation trigger="AboutToShow">
+                <section>
+                    <alpha start="0" end="255" easingcurve="OutQuart"/>
+                    <zoom start="0" end="100" easingcurve="OutQuart"/>
+                </section>
+            </animation>
+
+            <animation trigger="AboutToHide">
+                <section>
+                    <alpha start="255" end="0" easingcurve="InQuart"/>
+                    <zoom start="100" end="0" easingcurve="InQuart"/>
+                </section>
+            </animation>
+
+            <shape name="osd-status-backdrop" depends="scanprogresstext">
+                <area>64,624,1152,60</area>
+                <type>roundbox</type>
+                <fill color="#000000" alpha="140" />
+                <cornerradius>8</cornerradius>
+            </shape>
+
+            <shape name="osd-status-backdrop-line" depends="scanprogresstext">
+                <area>65,625,1150,58</area>
+                <type>roundbox</type>
+                <fill color="#000000" alpha="0" />
+                <line color="#ffffff" alpha="45" width="2" />
+                <cornerradius>6</cornerradius>
+            </shape>
+
+            <shape name="top-line" depends="scanprogresstext">
+                <area>66,626,1148,2</area>
+                <type>box</type>
+                <fill style="gradient">
+                    <gradient direction="horizontal" alpha="0">
+                        <stop position="0" color="#ffffff" />
+                        <stop position="50" color="#ffffff" alpha="120" />
+                        <stop position="100" color="#ffffff" />
+                    </gradient>
+                </fill>
+            </shape>
+
+            <shape name="bottom-line" from="top-line" depends="scanprogresstext">
+                <area>66,680,1148,2</area>
+            </shape>
+
+            <shape name="left-line" depends="scanprogresstext">
+                <area>66,628,2,52</area>
+                <type>box</type>
+                <fill style="gradient">
+                    <gradient direction="vertical" alpha="0">
+                        <stop position="0" color="#ffffff" />
+                        <stop position="50" color="#ffffff" alpha="180" />
+                        <stop position="100" color="#ffffff" />
+                    </gradient>
+                </fill>
+            </shape>
+
+            <shape name="right-line" from="left-line" depends="scanprogresstext">
+                <area>1212,628,2,52</area>
+            </shape>
+
+            <!-- Progress bar-->
+            <progressbar name="scanprogressbar">
+                <area>90,650,1100,8</area>
+                <layout>horizontal</layout>
+                <style>reveal</style>
+                <imagetype name="background">
+                    <area>0,0,100%,100%</area>
+                    <filename>images/osd/progressbar_background.png</filename>
+                </imagetype>
+                <imagetype name="progressimage">
+                    <area>0,0,100%,100%</area>
+                    <filename>images/osd/progressbar_fill.png</filename>
+                </imagetype>
+            </progressbar>
+
+            <!--Shows numerical scan progress-->
+            <textarea name="scanprogresstext" from="basetextarea">
+                <area>90,657,1100,24</area>
+                <font>basesmall</font>
+                <align>allcenter</align>
+            </textarea>
+        </group>
+
+        <!-- shows state of type filter -->
+        <textarea name="typefilter" from="basetextarea">
+            <area>1100,39,100,34</area>
+            <font>basesmallblue</font>
+            <align>left,vcenter</align>
+        </textarea>
+        <textarea name="typefilterAll" from="basetextarea" depends="!typefilter">
+            <value>All</value>
+            <area>1100,39,100,34</area>
+            <font>basesmallblue</font>
+            <align>left,vcenter</align>
+        </textarea>
+        <textarea name="typefilterlabel" from="basetextarea">
+            <value>Show:</value>
+            <area>1035,39,60,34</area>
+            <font>basesmallblue</font>
+            <align>right,vcenter</align>
+        </textarea>
+
+        <!-- shows state of hidden filter -->
+        <textarea name="hidefilter" from="basetextarea">
+            <area>1185,39,80,34</area>
+            <font>basesmallblue</font>
+            <align>right,vcenter</align>
+        </textarea>
+    </window>
+
+    <!-- Gallery Slideshow window which shows the a single image only or a slideshow. -->
+    <window name="slideshow">
+
+        <!-- Extra small text for Gallery images -->
+        <fontdef name="gallerytext" from="basesmall">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+        </fontdef>
+
+        <!-- the background behind the images -->
+        <shape name="background_shape">
+            <area>0,0,100%,100%</area>
+            <fill color="#000000" alpha="255"/>
+        </shape>
+
+        <!-- an image  -->
+        <imagetype name="image">
+            <area>0,0,100%,100%</area>
+            <preserveaspect>yes</preserveaspect>
+        </imagetype>
+
+        <!-- Represents "Show Captions" state for use as a dependancy by other widgets
+         Set = Hide; empty = Show  -->
+        <textarea name="hidecaptions" from="basetextarea">
+            <area>0,0,0,0</area>
+        </textarea>
+
+        <!-- End/Loading/Failed to load status -->
+        <textarea name="status" from="basetextarea" depends="!hidecaptions">
+            <area>200,0,100%-200,30</area>
+            <font>basesmall</font>
+            <align>hcenter,top</align>
+        </textarea>
+
+        <!-- Slide count -->
+        <textarea name="slidecount" from="basetextarea" depends="!hidecaptions">
+            <area>100%-200,0,190,30</area>
+            <font>gallerytext</font>
+            <align>right, vcentre</align>
+        </textarea>
+
+        <!-- Date/Comment -->
+        <textarea name="caption" from="basetextarea" depends="!hidecaptions">
+            <area>10,100%-28,100%-10,30</area>
+            <font>gallerytext</font>
+            <align>right, vcenter</align>
+            <cutdown>no</cutdown>
+            <scroll direction="horizontal"/>
+        </textarea>
+
+        <!-- Shows file info overlay -->
+        <buttonlist name="infolist" from="base_list">
+            <area>10,30,510,100%-30</area>
+            <layout>vertical</layout>
+            <spacing>1</spacing>
+            <scrollstyle>free</scrollstyle>
+            <arrange>stack</arrange>
+            <wrapstyle>items</wrapstyle>
+            <align>center</align>
+            <buttonarea>0,0,100%,100%</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,100%,30</area>
+                    <group name="select_bar" from="base_select_bar_active_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+                    <textarea name="name" from="basetextarea">
+                        <area>15,0,100%,30</area>
+                        <cutdown>yes</cutdown>
+                        <template>%NAME%: %VALUE%</template>
+                    </textarea>
+                </state>
+                <state name="selectedactive">
+                    <area>0,0,100%,64</area>
+                    <shape name="select_bar_backdrop_line" from="base_backdrop_line">
+                        <area>0,0,100%,100%-2</area>
+                        <type>box</type>
+                    </shape>
+                    <group name="select_bar" from="base_select_bar_selectedactive_group">
+                        <area>1,1,100%-2,100%-2</area>
+                    </group>
+
+                    <shape name="select_bar_left_line" from="base_highlight_vertical_line">
+                        <area>0,0,2,100%</area>
+                    </shape>
+                    <shape name="select_bar_right_line" from="base_highlight_vertical_line">
+                        <area>100%-4,0,2,100%</area>
+                    </shape>
+                    <textarea name="name" from="basetextarea">
+                        <area>15,5,100%,50</area>
+                        <multiline>yes</multiline>
+                        <scroll direction="up" rate="20"/>
+                        <template>%NAME%: %VALUE%</template>
+                        <font>basesmallyellow</font>
+                    </textarea>
+                </state>
+                <state name="selectedinactive" from="active" />
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>20,-15</position>
+                <state type="off">
+                    <imagetype name="upoff">
+                        <alpha>0</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="upon">
+                        <filename>images/lists_up_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>20,100%+10</position>
+                <state type="off">
+                    <imagetype name="dnoff">
+                        <alpha>0</alpha>
+                    </imagetype>
+                </state>
+                <state type="full">
+                    <imagetype name="dnon">
+                        <filename>images/lists_down_arrow.png</filename>
+                        <alpha>200</alpha>
+                    </imagetype>
+                </state>
+            </statetype>
+        </buttonlist>
+
+    </window>
+
+</mythuitheme>
diff --git a/linhes/linhes-theme/install-ui.xml b/linhes/linhes-theme/install-ui.xml
new file mode 100644
index 0000000..823b0dc
--- /dev/null
+++ b/linhes/linhes-theme/install-ui.xml
@@ -0,0 +1,188 @@
+<mythuitheme>
+
+    <window name="welcome_screen">
+        <textarea name="title" from="base_heading">
+            <value>Welcome to LinHES!</value>
+        </textarea>
+
+        <!--not used by mythinstall-->
+        <textarea name="time_text" from="basetextarea"/>
+
+        <!--version info-->
+        <shape name="version_box" from="base_backdrop">
+            <area>200,30,880,80</area>
+        </shape>
+        <shape name="version_box_backdrop_line" from="base_backdrop_line">
+            <area>200,30,880,80</area>
+        </shape>
+        <shape name="version_box_backdrop_top_line" from="base_highlight_line">
+            <area>202,31,878,2</area>
+        </shape>
+        <shape name="version_box_backdrop_bottom_line" from="base_highlight_line">
+            <area>202,107,878,2</area>
+        </shape>
+        <shape name="version_box_backdrop_left_line" from="base_highlight_vertical_line">
+            <area>202,33,2,80</area>
+        </shape>
+        <shape name="version_box_backdrop_right_line" from="base_highlight_vertical_line">
+            <area>1077,33,2,80</area>
+        </shape>
+        <textarea name="date_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <font>baselarge</font>
+            <area>210,30,860,80</area>
+            <value></value>
+            <align>allcenter</align>
+        </textarea>
+
+        <!--not used by mythinstall-->
+        <textarea name="status_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <font>basemedium</font>
+            <area>20,140,1240,60</area>
+            <value></value>
+        </textarea>
+
+        <!--not used by mythinstall-->
+        <textarea name="recording_label" from="basetextarea">
+            <font>baselarge</font>
+            <area>20,140,1240,30</area>
+            <value></value>
+        </textarea>
+
+        <shape name="recording_text_box" from="base_backdrop">
+            <area>200,120,880,160</area>
+        </shape>
+        <shape name="recording_text_box_backdrop_line" from="base_backdrop_line">
+            <area>200,120,880,160</area>
+        </shape>
+        <shape name="recording_text_box_backdrop_top_line" from="base_highlight_line">
+            <area>202,121,878,2</area>
+        </shape>
+        <shape name="recording_text_box_backdrop_bottom_line" from="base_highlight_line">
+            <area>202,277,878,2</area>
+        </shape>
+        <shape name="recording_text_box_backdrop_left_line" from="base_highlight_vertical_line">
+            <area>202,123,2,160</area>
+        </shape>
+        <shape name="recording_text_box_backdrop_right_line" from="base_highlight_vertical_line">
+            <area>1077,123,2,160</area>
+        </shape>
+
+        <!--mythinstall uses recording_text for percentage done-->
+        <textarea name="recording_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <font>basemedium</font>
+            <area>210,130,860,30</area>
+            <value>Press MENU for Options</value>
+            <align>center</align>
+        </textarea>
+
+        <!--not used by mythinstall-->
+        <textarea name="scheduled_label" from="basetextarea">
+            <font>baselarge</font>
+            <area>20,320,1240,30</area>
+            <value></value>
+        </textarea>
+
+        <!--mythinstall uses scheduled_text for status-->
+        <textarea name="scheduled_text">
+            <font>basemedium</font>
+            <area>210,185,860,30</area>
+            <value></value>
+            <align>center</align>
+        </textarea>
+
+        <!--mythinstall uses mythvantage_text for logs-->
+        <textarea name="mythvantage_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <font>basesmall</font>
+            <area>210,220,860,60</area>
+            <align>center</align>
+            <cutdown>yes</cutdown>
+            <value></value>
+        </textarea>
+
+        <imagetype name="LHLogo">
+            <area>365,480,550,179</area>
+            <preserveaspect>true</preserveaspect>
+            <filename>images/LHLogoAndText.png</filename>
+        </imagetype>
+
+        <imagetype name="logo">
+            <area>107,495,150,150</area>
+            <preserveaspect>true</preserveaspect>
+            <filepattern low="1" high="6">/usr/MythVantage/logos/logo-%1.png</filepattern>
+            <delay>5000</delay>
+        </imagetype>
+
+        <imagetype name="logo2" from="logo">
+            <area>1022,495,150,150</area>
+        </imagetype>
+
+    </window>
+
+    <window name="questionnotice_screen">
+
+        <textarea name="title" from="base_heading">
+            <value></value>
+        </textarea>
+
+        <shape name="questionnotice-backdrop" from="base_backdrop">
+            <area>115,36,1050,649</area>
+        </shape>
+
+        <shape name="questionnotice-backdrop-line" from="base_backdrop_line">
+            <area>116,37,1048,647</area>
+        </shape>
+
+        <shape name="questionnotice-top-line" from="base_highlight_line">
+            <area>117,38,1046,2</area>
+        </shape>
+
+        <shape name="questionnotice-bottom-line" from="base_highlight_line">
+            <area>117,681,1046,2</area>
+        </shape>
+
+        <shape name="questionnotice-left-line" from="base_highlight_vertical_line">
+            <area>117,40,2,641</area>
+        </shape>
+
+        <shape name="questionnotice-right-line" from="base_highlight_vertical_line">
+            <area>1161,40,2,641</area>
+        </shape>
+
+        <shape name="questionnotice-bottom-seperator-line" from="base_line">
+            <area>138,620,1004,2</area>
+        </shape>
+
+        <textarea name="notice_text" from="basetextarea">
+            <multiline>yes</multiline>
+            <area>138,58,1004,562</area>
+            <font>baselarge</font>
+            <value></value>
+            <align>top,hcenter</align>
+        </textarea>
+
+        <textarea name="question_text" from="notice_text">
+            <align>allcenter</align>
+        </textarea>
+
+        <button name="yes_button" from="base_button">
+            <area>233,632,350,40</area>
+            <value></value>
+        </button>
+
+        <button name="no_button" from="base_button">
+            <area>697,632,350,40</area>
+            <value></value>
+        </button>
+
+        <button name="ok_button" from="base_button">
+            <area>465,632,350,40</area>
+            <value>OK</value>
+        </button>
+
+    </window>
+
+</mythuitheme>
diff --git a/linhes/linhes-theme/lights_bud_background.png b/linhes/linhes-theme/lights_bud_background.png
new file mode 100644
index 0000000..a345970
Binary files /dev/null and b/linhes/linhes-theme/lights_bud_background.png differ
diff --git a/linhes/linhes-theme/linhes-theme.install b/linhes/linhes-theme/linhes-theme.install
new file mode 100644
index 0000000..4d84407
--- /dev/null
+++ b/linhes/linhes-theme/linhes-theme.install
@@ -0,0 +1,19 @@
+post_install() {
+  MYTHHOME=`lh_home_check.sh`
+  if ls $MYTHHOME/.mythtv/themecache/LinHES* 1> /dev/null 2>&1
+  then
+    echo "Clearing themecache and quitting mythfrontend."
+    /rm -rf $MYTHHOME/.mythtv/themecache/LinHES*
+    killall mythfrontend
+  fi
+  if ls $MYTHHOME/.mythtv/cache/themecache/LinHES* 1> /dev/null 2>&1
+  then
+    echo "Clearing themecache and quitting mythfrontend."
+    rm -rf $MYTHHOME/.mythtv/cache/themecache/LinHES*
+    killall mythfrontend
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/linhes/linhes-theme/menu-ui-vert.xml.patch b/linhes/linhes-theme/menu-ui-vert.xml.patch
new file mode 100644
index 0000000..3a0c3d9
--- /dev/null
+++ b/linhes/linhes-theme/menu-ui-vert.xml.patch
@@ -0,0 +1,211 @@
+--- menu-ui-vert.xml.orig	2017-01-12 02:27:03.269571903 +0000
++++ menu-ui-vert.xml	2017-01-12 02:19:35.517176026 +0000
+@@ -6,18 +6,53 @@
+         <area>0,0,1280,720</area>
+ 
+         <shape name="menuscroll-background" from="base_backdrop">
+-            <area>87,0,310,720</area>
++            <area>77,0,330,720</area>
+             <type>box</type>
+         </shape>
+ 
+         <shape name="menuscroll-left-line" from="base_vertical_line">
+-            <area>88,0,2,720</area>
++            <area>78,0,2,720</area>
+         </shape>
+ 
+         <shape name="menuscroll-right-line" from="base_vertical_line">
+-            <area>394,0,2,720</area>
++            <area>404,0,2,720</area>
+         </shape>
+ 
++        <!--LinHES UPDATE MESSAGE
++        <shape name="update_box" from="base_backdrop">
++            <area>485,639,718,53</area>
++        </shape>
++        <shape name="update_box_backdrop_line" from="base_backdrop_line">
++            <area>486,640,716,51</area>
++        </shape>
++        <shape name="update_box_backdrop_top_line" from="base_highlight_line">
++            <area>487,641,714,2</area>
++        </shape>
++        <shape name="update_box_backdrop_bottom_line" from="base_highlight_line">
++            <area>487,688,714,2</area>
++        </shape>
++        <shape name="update_box_backdrop_left_line" from="base_highlight_vertical_line">
++            <area>487,643,2,47</area>
++        </shape>
++        <shape name="update_box_backdrop_right_line" from="base_highlight_vertical_line">
++            <area>1199,645,2,47</area>
++        </shape>
++        <textarea name="update_text">
++            <area>756,641,437,50</area>
++            <font>basesmallyellow</font>
++            <value>updates available in the Service Menu</value>
++            <multiline>no</multiline>
++            <align>left,vcenter</align>
++        </textarea>
++        -->
++
++        <imagetype name="LHlogo">
++            <area>554,645,172,43</area>
++            <filename>images/LHLogo.png</filename> 
++            <!--LHLogoAndText 851x277 3.072-->
++            <!--LHLogo 851x219 3.886-->
++        </imagetype>
++
+         <statetype name="titles">
+             <state name="MAIN">
+                 <textarea name="heading">
+@@ -123,10 +158,55 @@
+                     <value>Archive Utilities</value>
+                 </textarea>
+             </state>
++            <state name="LH_SERVICE_MENU" from="MAIN">
++                 <textarea name="heading">
++                     <value>Service Menu</value>
++                 </textarea>
++             </state>
++            <state name="LH_UPDATE" from="MAIN">
++                 <textarea name="heading">
++                     <value>Update LinHES</value>
++                 </textarea>
++             </state>
++            <state name="LH_BACKUP" from="MAIN">
++                 <textarea name="heading">
++                     <value>Backup LinHES</value>
++                 </textarea>
++             </state>
++            <state name="LH_RESTORE" from="MAIN">
++                 <textarea name="heading">
++                     <value>Restore LinHES</value>
++                 </textarea>
++             </state>
++            <state name="LH_TOOLS" from="MAIN">
++                 <textarea name="heading">
++                     <value>LinHES Tools</value>
++                 </textarea>
++             </state>
++            <state name="LH_BACKEND" from="MAIN">
++                 <textarea name="heading">
++                     <value>MythBackend Control</value>
++                 </textarea>
++             </state>
++             <state name="HOST_SETTINGS" from="MAIN">
++                 <textarea name="heading">
++                     <value>LinHES Settings</value>
++                 </textarea>
++             </state>
++             <state name="TRAILERS" from="MAIN">
++                 <textarea name="heading">
++                     <value>Apple Trailers</value>
++                 </textarea>
++             </state>
++             <state name="INTERNET_STREAMS" from="MAIN">
++                 <textarea name="heading">
++                     <value>Online Content</value>
++                 </textarea>
++             </state>
+         </statetype>
+ 
+         <buttonlist name="menu">
+-            <area>87,62,310,596</area>
++            <area>77,62,330,586</area>
+             <layout>vertical</layout>
+             <spacing>4</spacing>
+             <scrollstyle>free</scrollstyle>
+@@ -136,9 +216,9 @@
+             <buttonarea>0,0,100%,100%</buttonarea>
+             <statetype name="buttonitem">
+                 <state name="active">
+-                    <area>0,0,310,64</area>
++                    <area>0,0,330,60</area>
+                     <textarea name="buttontext">
+-                        <area>12,0,286,64</area>
++                        <area>15,0,300,100%</area>
+                         <font>basemediumlightgrey</font>
+                         <multiline>yes</multiline>
+                         <align>allcenter</align>
+@@ -147,40 +227,48 @@
+                     </textarea>
+                 </state>
+                 <state name="selectedactive"> 
+-                    <area>-10,0,330,64</area>
++                    <area>-20,0,370,80</area>
++                    <shape name="select_bar_backdrop_line" from="base_backdrop_line">
++                        <area>0,0,100%,100%-2</area>
++                        <line color="#0072bc" alpha="45" width="2" />
++                        <type>box</type>
++                    </shape>
+                     <group name="select_bar" from="base_select_bar_selectedactive_group">
+-                        <area>0,0,330,100%</area>
++                        <area>1,1,100%-2,100%-2</area>
+                     </group>
++                    <shape name="select_bar_left_line" from="base_highlight_vertical_line">
++                        <area>0,0,2,100%</area>
++                        <fill style="gradient">
++                            <gradient alpha="0" direction="vertical">
++                                <stop position="0" color="#0072bc" />
++                                <stop position="50" color="#0072bc" alpha="180" />
++                                <stop position="100" color="#0072bc" />
++                            </gradient>
++                        </fill>
++                    </shape>
++                    <shape name="select_bar_right_line" from="select_bar_left_line">
++                        <area>100%-2,0,2,100%</area>
++                    </shape>
+                     <textarea name="buttontext">
+-                        <area>5,0,320,64</area>
++                        <area>30,0,100%-30,57%</area>
+                         <font>basemediumlargerdarkyellow</font>
+-                        <multiline>yes</multiline>
+-                        <!-- cpu usage is very high
+-                        <alphapulse min="100" max="255" change="2"/>
+-                         -->
+-                        <align>allcenter</align>
+-                        <cutdown>yes</cutdown>
++                        <align>bottom, hcenter</align>
++                        <multiline>no</multiline>
+                         <case>upper</case>
++                        <scroll direction="left" rate="90" startdelay="1" />
+                     </textarea>
+-                    <group name="variable-size-text-backdrop-group">
+-                        <area>330,12,843,40</area>
+-                        <minsize vanish="true">252,40</minsize>
+-                        <shape name="text-backdrop" from="base_backdrop">
+-                            <area>0,0,-1,-1</area>
+-                            <minsize vanish="true">252,40</minsize>
+-                        </shape>
+-                        <textarea name="description" from="basetextarea">
+-                            <area>20,1,-20,-1</area>
+-                            <minsize shrink="short" vanish="true">5,5</minsize>
+-                            <font>basesmalldarkyellow</font>
+-                            <align>left,vcenter</align>
+-                            <multiline>no</multiline>
+-                        </textarea>
+-                    </group>
++                    <textarea name="description">
++                        <area>30,57%,100%-30,100%</area>
++                        <align>top, hcenter</align>
++                        <font>baseextrasmallyellow</font>
++                        <multiline>no</multiline>
++                        <scroll direction="left" rate="90" startdelay="1" />
++                    </textarea>
++
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>147,0</position>
++                <position>161,0</position>
+                 <showempty>yes</showempty>
+                 <state type="full">
+                     <imagetype name="upon">
+@@ -190,7 +278,7 @@
+                 </state>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>147,588</position>
++                <position>161,578</position>
+                 <showempty>yes</showempty>
+                 <state type="full">
+                     <imagetype name="dnon">
diff --git a/linhes/linhes-theme/music-base.xml.patch b/linhes/linhes-theme/music-base.xml.patch
new file mode 100644
index 0000000..7c8e3bf
--- /dev/null
+++ b/linhes/linhes-theme/music-base.xml.patch
@@ -0,0 +1,121 @@
+--- music-base.xml.orig	2016-12-13 20:45:06.068067497 +0000
++++ music-base.xml	2016-12-18 00:17:16.171607805 +0000
+@@ -360,7 +360,6 @@
+                     <textarea name="title" from="buttontext">
+                         <area>143,0,1066,30</area>
+                         <align>left,vcenter</align>
+-                        <font>basesmall</font>
+                         <template>%TITLE% by %ARTIST% on %ALBUM%</template>
+                     </textarea>
+                 </state>
+@@ -412,9 +411,12 @@
+                     </textarea>
+                 </state>
+                 <state name="selectedinactive" from="selectedactive">
+-                <group name="select_bar" from="base_select_bar_selectedinactive_group">
+-                    <area>0,0,100%,100%</area>
+-                </group>
++                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                    <textarea name="title">
++                        <font>basesmall</font>
++                    </textarea>
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+@@ -450,7 +452,7 @@
+             <textarea name="shuffletext" from="basetextarea">
+                 <area>0,0,300,22</area>
+                 <font>basesmaller</font>
+-                <value>Shuffle Mode: Intelligent</value>
++                <value>Shuffle Mode: Smart</value>
+                 <align>left,vcenter</align>
+             </textarea>
+         </state>
+@@ -504,7 +506,7 @@
+         </statetype>
+ 
+         <textarea name="playlistposition" from="basetextarea">
+-            <area>192,9,170,14</area>
++            <area>192,8,170,14</area>
+             <font>basesupersmallyellow</font>
+             <align>right,vcenter</align>
+         </textarea>
+@@ -514,7 +516,7 @@
+         </progressbar>
+ 
+         <textarea name="playlisttime" from="basetextarea">
+-            <area>918,9,230,14</area>
++            <area>918,8,230,14</area>
+             <font>basesupersmallyellow</font>
+             <align>left,vcenter</align>
+         </textarea>
+@@ -574,7 +576,7 @@
+         </imagetype>
+ 
+         <textarea name="title" from="basetextarea">
+-            <area>171,18,938,24</area>
++            <area>171,14,938,24</area>
+             <font>basesmallyellow</font>
+         </textarea>
+ 
+@@ -615,11 +617,11 @@
+             <font>baseevensmaller</font>
+             <align>allcenter</align>
+         </textarea>
+-
++<!--
+         <group name="musiccontrols" from="base_music_controls">
+             <position>535,140</position>
+         </group>
+-
++-->
+         <statetype name="mutestate" from="base_mute_state">
+             <position>44,146</position>
+         </statetype>
+@@ -629,11 +631,11 @@
+         </textarea>
+ 
+         <progressbar name="progress" from="baseprogressbar">
+-            <position>372,162</position>
++            <position>372,152</position>
+         </progressbar>
+ 
+         <textarea name="time" from="basetextarea">
+-            <area>918,161,185,14</area>
++            <area>918,149,185,14</area>
+             <font>basesupersmallyellow</font>
+         </textarea>
+ 
+@@ -718,7 +720,7 @@
+ 
+         <textarea name="title" from="basetextarea">
+             <area>146,7,987,28</area>
+-            <font>basesmaller</font>
++            <font>basesmalleryellow</font>
+             <template>%TITLE% - %ARTIST% - %ALBUM%</template>
+         </textarea>
+ 
+@@ -739,17 +741,17 @@
+         <textarea name="volume" from="base_volume">
+             <position>190,57</position>
+         </textarea>
+-
++<!--
+         <group name="musiccontrols" from="base_music_controls">
+             <position>535,68</position>
+         </group>
+-
++-->
+         <progressbar name="progress" from="baseprogressbar">
+-            <position>372,90</position>
++            <position>372,79</position>
+         </progressbar>
+ 
+         <textarea name="time" from="basetextarea">
+-            <area>918,89,185,14</area>
++            <area>918,77,185,14</area>
+             <font>basesupersmallyellow</font>
+         </textarea>
+ 
diff --git a/linhes/linhes-theme/music-ui.xml.patch b/linhes/linhes-theme/music-ui.xml.patch
new file mode 100644
index 0000000..6d01256
--- /dev/null
+++ b/linhes/linhes-theme/music-ui.xml.patch
@@ -0,0 +1,704 @@
+--- music-ui.xml.orig	2016-12-13 20:47:17.067929339 +0000
++++ music-ui.xml	2017-01-12 02:19:35.520508931 +0000
+@@ -6,7 +6,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Current Play List View</value>
++            <value>Current Playlist View</value>
+         </textarea>
+ 
+         <shape name="play-list-backdrop" from="base_backdrop">
+@@ -41,7 +41,7 @@
+             <area>28,44,1224,406</area>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+-            <value>You haven't selected any tracks to play</value>
++            <value>Press MENU to add tracks to Current Playlist</value>
+         </textarea>
+ 
+         <!-- current playlist button list -->
+@@ -92,7 +92,7 @@
+                         </state>
+                     </statetype>
+                     <textarea name="tracknum">
+-                        <area>133,0,52,30</area>
++                        <area>118,0,70,30</area>
+                         <font>basesmall</font>
+                         <align>right,vcenter</align>
+                         <template>%1 -</template>
+@@ -107,7 +107,7 @@
+                         <align>left,vcenter</align>
+                     </textarea>
+                     <textarea name="length" from="title">
+-                        <area>1139,0,70,30</area>
++                        <area>1129,0,80,30</area>
+                         <align>right,vcenter</align>
+                     </textarea>
+                 </state>
+@@ -121,7 +121,7 @@
+                         <state name="playing">
+                             <area>0,0,100%,100%</area>
+                             <textarea name="playing" from="basetextarea">
+-                                <area>84,0,70,64</area>
++                                <area>74,0,70,64</area>
+                                 <font>basesupersmallgreen</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -132,7 +132,7 @@
+                         <state name="paused">
+                             <area>0,0,100%,100%</area>
+                             <textarea name="paused" from="basetextarea">
+-                                <area>84,0,70,64</area>
++                                <area>74,0,70,64</area>
+                                 <font>basesupersmallyellow</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -143,7 +143,7 @@
+                         <state name="stopped">
+                             <area>0,0,100%,100%</area>
+                             <textarea name="stopped" from="basetextarea">
+-                                <area>84,0,70,64</area>
++                                <area>74,0,70,64</area>
+                                 <font>basesupersmallred</font>
+                                 <cutdown>no</cutdown>
+                                 <align>allcenter</align>
+@@ -153,40 +153,45 @@
+                         </state>
+                     </statetype>
+                     <textarea name="tracknum">
+-                        <area>159,2,52,24</area>
++                        <area>118,1,70,24</area>
+                         <font>basesmallyellow</font>
+-                        <align>right,vcenter</align>
++                        <align>right,top</align>
+                         <template>%1 -</template>
+                     </textarea>
+                     <textarea name="title">
+-                        <area>219,2,540,24</area>
++                        <area>193,1,566,24</area>
++                        <align>left,top</align>
+                         <font>basesmallyellow</font>
++                        <scroll direction="left" startdelay="1"/>
+                     </textarea>
+                     <textarea name="artist" from="title">
+-                        <area>774,2,350,24</area>
++                        <area>774,1,350,24</area>
++                        <scroll direction="left" startdelay="1"/>
+                     </textarea>
+-                    <textarea name="length" from="title">
+-                        <area>1139,2,70,24</area>
++                    <textarea name="length">
++                        <area>1129,1,80,24</area>
+                         <align>right,vcenter</align>
++                        <font>basesmallyellow</font>
+                     </textarea>
+                     <textarea name="album">
+-                        <area>229,0,540,64</area>
+-                        <font>baseextrasmallyellow</font>
++                        <area>193,24,566,20</area>
++                        <font>baseextrasmallblue</font>
+                         <align>left,vcenter</align>
+                     </textarea>
+                     <textarea name="genre" from="album">
+-                        <area>784,0,340,64</area>
++                        <area>774,24,350,20</area>
+                     </textarea>
+                     <statetype name="ratingstate" from="base_rating_state">
+-                        <position>219,40</position>
++                        <position>193,40</position>
+                     </statetype>
+                     <textarea name="lastplayed" from="album">
+-                        <area>774,43,250,20</area>
++                        <area>774,43,260,20</area>
++                        <font>baseextrasmall</font>
+                     </textarea>
+-                    <textarea name="playcount" from="album">
++                    <textarea name="playcount" from="lastplayed">
+                         <area>1039,43,170,20</area>
+                         <align>right,vcenter</align>
+-                        <template>Played %1 times</template>
++                        <template>Played: %1</template>
+                     </textarea>
+                 </state>
+                 <state name="selectedinactive" from="selectedactive">
+@@ -217,7 +222,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Play List Editor Tree View</value>
++            <value>Playlist Editor Tree View</value>
+         </textarea>
+ 
+         <shape name="breadcrumbs-backdrop" from="base_backdrop">
+@@ -274,6 +279,7 @@
+             <area>36,39,993,30</area>
+             <font>basesmallyellow</font>
+             <align>left,vcenter</align>
++            <scroll direction="horizontal" startdelay="1" rate="80"/>
+         </textarea>
+ 
+          <!-- optional - shows current position in grid eg '1 of 123' -->
+@@ -355,7 +361,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Play List Editor Gallery View</value>
++            <value>Playlist Editor Gallery View</value>
+         </textarea>
+ 
+         <shape name="breadcrumbs-backdrop" from="base_backdrop">
+@@ -404,6 +410,7 @@
+             <area>36,39,993,30</area>
+             <font>basesmallyellow</font>
+             <align>left,vcenter</align>
++            <scroll direction="horizontal" startdelay="1" rate="80"/>
+         </textarea>
+ 
+          <!-- optional - shows current position in grid eg '1 of 123' -->
+@@ -435,7 +442,8 @@
+                         </group>
+                         <imagetype name="buttonimage">
+                             <area>8,8,120,120</area>
+-                            <filename>mythmusic/mm_nothumb.png</filename>
++                            <filename>mythmusic/mm_category.png</filename>
++                            <alpha>100</alpha>
+                         </imagetype>
+                         <statetype name="nodetype">
+                             <position>8,8</position>
+@@ -443,73 +451,85 @@
+                             <state name="alltracks">
+                                 <imagetype name="alltracks">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="genres">
+                                 <imagetype name="genres">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="albums">
+                                 <imagetype name="albums">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="artists">
+                                 <imagetype name="artists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="compartists">
+                                 <imagetype name="compartists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="ratings">
+                                 <imagetype name="ratings">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="years">
+                                 <imagetype name="years">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="compilations">
+                                 <imagetype name="compilations">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="cd">
+                                 <imagetype name="cd">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="directory">
+                                 <imagetype name="directory">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="playlists">
+                                 <imagetype name="playlists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="smartplaylists">
+                                 <imagetype name="smartplaylists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
++                                    <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                         </statetype>
+@@ -547,7 +567,7 @@
+                             <area>0,0,100%,100%</area>
+                             <type>roundbox</type>
+                             <fill color="#101017" alpha="255" />
+-                            <line color="#ffffff" alpha="45" width="4" />
++                            <line color="#0072bc" alpha="45" width="4" />
+                             <cornerradius>8</cornerradius>
+                         </shape>
+                         <shape name="select_bar_top_highlight_line">
+@@ -555,9 +575,9 @@
+                             <type>box</type>
+                             <fill style="gradient">
+                                 <gradient direction="horizontal" alpha="0">
+-                                    <stop position="0" color="#ffffff" />
+-                                    <stop position="50" color="#ffffff" alpha="180" />
+-                                    <stop position="100" color="#ffffff" />
++                                    <stop position="0" color="#0072bc" />
++                                    <stop position="50" color="#0072bc" alpha="180" />
++                                    <stop position="100" color="#0072bc" />
+                                 </gradient>
+                             </fill>
+                         </shape>
+@@ -569,9 +589,9 @@
+                             <type>box</type>
+                             <fill style="gradient">
+                                 <gradient alpha="0" direction="vertical">
+-                                    <stop position="0" color="#ffffff" />
+-                                    <stop position="50" color="#ffffff" alpha="220" />
+-                                    <stop position="100" color="#ffffff" />
++                                    <stop position="0" color="#0072bc" />
++                                    <stop position="50" color="#0072bc" alpha="220" />
++                                    <stop position="100" color="#0072bc" />
+                                 </gradient>
+                             </fill>
+                         </shape>
+@@ -580,7 +600,7 @@
+                         </shape>
+                         <imagetype name="buttonimage">
+                             <area>8,8,120,120</area>
+-                            <filename>mythmusic/mm_nothumb.png</filename>
++                            <filename>mythmusic/mm_category.png</filename>
+                         </imagetype>
+                         <statetype name="nodetype">
+                             <position>8,8</position>
+@@ -588,73 +608,73 @@
+                             <state name="alltracks">
+                                 <imagetype name="alltracks">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="genres">
+                                 <imagetype name="genres">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="albums">
+                                 <imagetype name="albums">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="artists">
+                                 <imagetype name="artists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="compartists">
+                                 <imagetype name="compartists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="ratings">
+                                 <imagetype name="ratings">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="years">
+                                 <imagetype name="years">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="compilations">
+                                 <imagetype name="compilations">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="cd">
+                                 <imagetype name="cd">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="directory">
+                                 <imagetype name="directory">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="playlists">
+                                 <imagetype name="playlists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                             <state name="smartplaylists">
+                                 <imagetype name="smartplaylists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                 </imagetype>
+                             </state>
+                         </statetype>
+@@ -681,22 +701,50 @@
+                                 <area>5,1,-5,-3</area>
+                                 <align>bottom,hcenter</align>
+                                 <minsize shrink="short" vanish="true">5,5</minsize>
+-                                <font>baseextrasmall</font>
++                                <font>baseextrasmallyellow</font>
+                                 <multiline>yes</multiline>
+                             </textarea>
+                         </group>
+                     </state>
+-                    <state name="selectedinactive">
+-                        <group name="select_bar" from="base_button_select_bar_disabled_group">
+-                            <area>0,0,136,136</area>
+-                            <shape name="select_bar">
+-                                <fill color="#333333" alpha="255" />
+-                                <cornerradius>8</cornerradius>
+-                            </shape>
+-                        </group>
++                    <state name="selectedinactive" from="selectedactive">
++                        <shape name="select_bar">
++                            <area>0,0,100%,100%</area>
++                            <type>roundbox</type>
++                            <fill color="#101017" alpha="255" />
++                            <line color="#ffffff" alpha="45" width="4" />
++                            <cornerradius>8</cornerradius>
++                        </shape>
++                        <shape name="select_bar_top_highlight_line">
++                            <area>8,2,120,4</area>
++                            <type>box</type>
++                            <fill style="gradient">
++                                <gradient direction="horizontal" alpha="0">
++                                    <stop position="0" color="#ffffff" />
++                                    <stop position="50" color="#ffffff" alpha="180" />
++                                    <stop position="100" color="#ffffff" />
++                                </gradient>
++                            </fill>
++                        </shape>
++                        <shape name="select_bar_bottom_highlight_line" from="select_bar_top_highlight_line">
++                            <area>8,130,120,4</area>
++                        </shape>
++                        <shape name="select_bar_left_highlight_line">
++                            <area>2,8,4,120</area>
++                            <type>box</type>
++                            <fill style="gradient">
++                                <gradient alpha="0" direction="vertical">
++                                    <stop position="0" color="#ffffff" />
++                                    <stop position="50" color="#ffffff" alpha="220" />
++                                    <stop position="100" color="#ffffff" />
++                                </gradient>
++                            </fill>
++                        </shape>
++                        <shape name="select_bar_right_highlight_line" from="select_bar_left_highlight_line">
++                            <area>130,8,4,120</area>
++                        </shape>
+                         <imagetype name="buttonimage">
+                             <area>8,8,120,120</area>
+-                            <filename>mythmusic/mm_nothumb.png</filename>
++                            <filename>mythmusic/mm_category.png</filename>
+                             <alpha>100</alpha>
+                         </imagetype>
+                         <statetype name="nodetype">
+@@ -705,94 +753,84 @@
+                             <state name="alltracks">
+                                 <imagetype name="alltracks">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="genres">
+                                 <imagetype name="genres">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="albums">
+                                 <imagetype name="albums">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="artists">
+                                 <imagetype name="artists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="compartists">
+                                 <imagetype name="compartists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="ratings">
+                                 <imagetype name="ratings">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="years">
+                                 <imagetype name="years">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="compilations">
+                                 <imagetype name="compilations">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="cd">
+                                 <imagetype name="cd">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="directory">
+                                 <imagetype name="directory">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="playlists">
+                                 <imagetype name="playlists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+                             <state name="smartplaylists">
+                                 <imagetype name="smartplaylists">
+                                     <area>0,0,120,120</area>
+-                                    <filename>mythmusic/mm_category.png</filename>
+-                                    <alpha>100</alpha>
+-                                </imagetype>
+-                            </state>
+-                        </statetype>
+-                        <statetype name="buttoncheck">
+-                            <position>8,8</position>
+-                            <showempty>yes</showempty>
+-                            <state type="full">
+-                                <imagetype name="marked">
+-                                    <filename>mythmusic/playlist_yes.png</filename>
++                                    <filename>mythmusic/mm_nothumb.png</filename>
+                                     <alpha>100</alpha>
+                                 </imagetype>
+                             </state>
+@@ -813,7 +851,6 @@
+                                 <minsize shrink="short" vanish="true">5,5</minsize>
+                                 <font>baseextrasmall</font>
+                                 <multiline>yes</multiline>
+-                                <alpha>100</alpha>
+                             </textarea>
+                         </group>
+                     </state>
+@@ -1909,6 +1946,122 @@
+ 
+     </window>
+ 
++    <window name="trackslyricsview">
++        <area>0,0,1280,720</area>
++
++        <group name="heading-backdrop" from="base_heading_group" />
++
++        <textarea name="heading" from="base_heading">
++            <value>Track Lyrics View</value>
++        </textarea>
++
++        <shape name="lyrics-backdrop" from="base_backdrop">
++            <area>20,36,1240,453</area>
++        </shape>
++
++        <shape name="lyrics-backdrop-line" from="base_backdrop_line">
++            <area>21,37,1238,451</area>
++        </shape>
++
++        <shape name="lyrics-top-line" from="base_highlight_line">
++            <area>21,38,1238,2</area>
++        </shape>
++
++        <shape name="lyrics-bottom-line" from="base_highlight_line">
++            <area>21,486,1238,2</area>
++        </shape>
++
++        <shape name="lyrics-list-left-line" from="base_highlight_vertical_line">
++            <area>22,40,2,446</area>
++        </shape>
++
++        <shape name="lyrics-list-right-line" from="base_highlight_vertical_line">
++            <area>1256,40,2,446</area>
++        </shape>
++
++        <shape name="lyrics-list-arrows-backdrop" from="base_arrows_backdrop">
++            <area>1207,490,50,11</area>
++        </shape>
++
++        <buttonlist name="lyrics_list" from="base_list">
++            <area>28,44,1224,440</area>
++            <searchposition>-1,466</searchposition>
++            <buttonarea>0,0,1224,440</buttonarea>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <area>0,0,100%,30</area>
++                    <textarea name="buttontext">
++                        <area>0,0,100%,100%</area>
++                        <align>top,hcenter</align>
++                        <font>basesmall</font>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active">
++                    <group name="select_bar" from="base_select_bar_selectedactive_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                    <textarea name="buttontext">
++                        <font>basesmallyellow</font>
++                    </textarea>
++                </state>
++                <state name="selectedinactive" from="selectedactive">
++                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
++                        <area>0,0,100%,100%</area>
++                    </group>
++                </state>
++            </statetype>
++
++            <statetype name="upscrollarrow">
++                <position>1186,448</position>
++            </statetype>
++
++            <statetype name="downscrollarrow">
++                <position>1206,448</position>
++            </statetype>
++        </buttonlist>
++
++        <statetype name="loading_state">
++            <position>339,153</position>
++            <state name="off"></state>
++            <state name="on">
++                <shape name="boxshape" from="base_popup_backdrop">
++                    <area>0,0,602,144</area>
++                </shape>
++                <shape name="boxshape-line" from="base_backdrop_line">
++                    <area>1,1,600,142</area>
++                </shape>
++                <shape name="busy-dialog-top-line" from="base_highlight_line">
++                    <area>2,2,598,2</area>
++                </shape>
++                <shape name="busy-dialog-bottom-line" from="base_highlight_line">
++                    <area>2,140,598,2</area>
++                </shape>
++                <shape name="busy-dialog-left-line" from="base_highlight_vertical_line">
++                    <area>2,4,2,138</area>
++                </shape>
++                <shape name="busy-dialog-right-line" from="base_highlight_vertical_line">
++                    <area>598,4,2,138</area>
++                </shape>
++                <imagetype name="loadinganimation">
++                    <position>33,65</position>
++                    <filepattern low="1" high="60" cycle="reverse">images/busy/busy%1.png</filepattern>
++                    <delay>12</delay>
++                </imagetype>
++            </state>
++        </statetype>
++
++        <textarea name="status_text" from="basetextarea">
++            <area>20,36,1240,453</area>
++            <font>basemediumyellow</font>
++            <align>allcenter</align>
++        </textarea>
++
++        <group name="trackinfopanel" from="base_info_panel">
++            <area>0,506,1280,240</area>
++        </group>
++
++    </window>
++
+     <window name="editmetadata">
+         <area>0,0,1280,720</area>
+ 
+@@ -3492,7 +3645,7 @@
+             </section>
+         </animation>
+ 
+-	<shape name="cd-rip-backdrop" from="base_popup_backdrop">
++        <shape name="cd-rip-backdrop" from="base_popup_backdrop">
+             <area>0,0,800,360</area>
+         </shape>
+ 
diff --git a/linhes/linhes-theme/musicsettings-ui.xml.patch b/linhes/linhes-theme/musicsettings-ui.xml.patch
new file mode 100644
index 0000000..a667eab
--- /dev/null
+++ b/linhes/linhes-theme/musicsettings-ui.xml.patch
@@ -0,0 +1,366 @@
+--- musicsettings-ui.xml.orig	2017-10-26 18:28:30.226541178 +0000
++++ musicsettings-ui.xml	2017-10-26 19:57:07.944986189 +0000
+@@ -60,7 +60,7 @@
+         <textarea name="musiclocation_label" from="basetextarea">
+             <area>129,72,428,40</area>
+             <align>right,vcenter</align>
+-            <value>Directory to hold music:</value>
++            <value>Directory to Hold Music:</value>
+         </textarea>
+ 
+         <textedit name="musiclocation" from="base_textedit">
+@@ -70,7 +70,7 @@
+         <textarea name="musiccddevice_label" from="basetextarea">
+             <area>129,143,428,40</area>
+             <align>right,vcenter</align>
+-            <value>CD device:</value>
++            <value>CD Device:</value>
+         </textarea>
+ 
+         <textedit name="musiccddevice" from="base_textedit">
+@@ -80,7 +80,7 @@
+         <textarea name="musicaudiodevice_label" from="basetextarea">
+             <area>129,214,428,40</area>
+             <align>right,vcenter</align>
+-            <value>Audio device:</value>
++            <value>Audio Device:</value>
+         </textarea>
+ 
+         <textedit name="musicaudiodevice" from="base_textedit">
+@@ -90,7 +90,7 @@
+         <textarea name="musicdefaultupmix_label" from="basetextarea">
+             <area>129,285,429,30</area>
+             <align>right,vcenter</align>
+-            <value>Convert stereo to 5.1 sound:</value>
++            <value>Convert Stereo to 5.1 Surround:</value>
+         </textarea>
+ 
+         <checkbox name="musicdefaultupmix" from="base_checkbox">
+@@ -120,7 +120,7 @@
+         <textarea name="allowtagwriting_label" from="basetextarea">
+             <area>129,478,428,30</area>
+             <align>right,vcenter</align>
+-            <value>Allow metadata to be written to tags:</value>
++            <value>Allow Metadata to be Written to Tags:</value>
+         </textarea>
+ 
+         <checkbox name="allowtagwriting" from="base_checkbox">
+@@ -129,19 +129,20 @@
+ 
+         <textarea name="helptext" from="basetextarea">
+             <area>139,552,1003,66</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+         </textarea>
+ 
+-        <button name="save" from="base_button">
++        <button name="cancel" from="base_button">
+             <area>233,632,350,40</area>
+-            <value>Save</value>
++            <value>Cancel</value>
+         </button>
+-        <button name="cancel" from="base_button">
++
++        <button name="save" from="base_button">
+             <area>697,632,350,40</area>
+-            <value>Cancel</value>
++            <value>Save</value>
+         </button>
+     </window>
+ 
+@@ -213,7 +214,7 @@
+         <textarea name="filenametemplate_label" from="basetextarea">
+             <area>128,127,430,40</area>
+             <align>right,vcenter</align>
+-            <value>File storage location:</value>
++            <value>File Storage Location:</value>
+         </textarea>
+ 
+         <textedit name="filenametemplate" from="base_textedit">
+@@ -223,7 +224,7 @@
+         <textarea name="nowhitespace_label" from="basetextarea">
+             <area>128,190,430,30</area>
+             <align>right,vcenter</align>
+-            <value>Replace space with underscore:</value>
++            <value>Replace Space with Underscore:</value>
+         </textarea>
+ 
+         <checkbox name="nowhitespace" from="base_checkbox">
+@@ -253,7 +254,7 @@
+         <textarea name="mp3usevbr_label" from="basetextarea">
+             <area>128,369,430,30</area>
+             <align>right,vcenter</align>
+-            <value>Use variable bitrates:</value>
++            <value>Use Variable Bitrates:</value>
+         </textarea>
+ 
+         <checkbox name="mp3usevbr" from="base_checkbox">
+@@ -263,7 +264,7 @@
+         <textarea name="ejectcd_label" from="basetextarea">
+             <area>128,422,430,30</area>
+             <align>right,vcenter</align>
+-            <value>Automatically eject CDs after ripping:</value>
++            <value>Automatically Eject CDs After Ripping:</value>
+         </textarea>
+ 
+         <checkbox name="ejectcd" from="base_checkbox">
+@@ -282,20 +283,20 @@
+ 
+         <textarea name="helptext" from="basetextarea">
+             <area>139,552,1003,66</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+         </textarea>
+ 
+-        <button name="save" from="base_button">
++        <button name="cancel" from="base_button">
+             <area>233,632,350,40</area>
+-            <value>Save</value>
++            <value>Cancel</value>
+         </button>
+ 
+-        <button name="cancel" from="base_button">
++        <button name="save" from="base_button">
+             <area>697,632,350,40</area>
+-            <value>Cancel</value>
++            <value>Save</value>
+         </button>
+     </window>
+ 
+@@ -307,109 +308,140 @@
+         </textarea>
+ 
+         <shape name="player-settings-backdrop" from="base_backdrop">
+-            <area>215,36,850,649</area>
++            <area>115,36,1050,649</area>
+         </shape>
+ 
+         <shape name="player-settings-backdrop-line" from="base_backdrop_line">
+-            <area>216,37,848,506</area>
++            <area>116,37,1048,506</area>
+         </shape>
+ 
+         <shape name="player-settings-top-line" from="base_highlight_line">
+-            <area>217,38,846,2</area>
++            <area>117,38,1046,2</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-line" from="base_highlight_line">
+-            <area>217,540,846,2</area>
++            <area>117,540,1046,2</area>
+         </shape>
+ 
+         <shape name="player-settings-left-line" from="base_highlight_vertical_line">
+-            <area>217,40,2,500</area>
++            <area>117,40,2,500</area>
+         </shape>
+ 
+         <shape name="player-settings-right-line" from="base_highlight_vertical_line">
+-            <area>1061,40,2,500</area>
++            <area>1161,40,2,500</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-backdrop-line" from="base_backdrop_line">
+-            <area>216,547,848,137</area>
++            <area>116,547,1048,137</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-top-line" from="base_highlight_line">
+-            <area>217,548,846,2</area>
++            <area>117,548,1046,2</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-bottom-line" from="base_highlight_line">
+-            <area>217,681,846,2</area>
++            <area>117,681,1046,2</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-left-line" from="base_highlight_vertical_line">
+-            <area>217,550,2,131</area>
++            <area>117,550,2,131</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-right-line" from="base_highlight_vertical_line">
+-            <area>1061,550,2,131</area>
++            <area>1161,550,2,131</area>
+         </shape>
+ 
+         <shape name="player-settings-bottom-seperator-first-line" from="base_line">
+-            <area>238,613,804,2</area>
++            <area>138,620,1004,2</area>
+         </shape>
+ 
+         <textarea name="resumemode_label" from="basetextarea">
+-            <area>315,112,300,40</area>
++            <area>129,72,428,40</area>
+             <align>right,vcenter</align>
+-            <value>Resume mode:</value>
++            <value>Playlist Resume Mode:</value>
+         </textarea>
+ 
+         <buttonlist name="resumemode" from="base_selector">
+-            <area>625,112,300,40</area>
++            <area>567,72,550,40</area>
++        </buttonlist>
++
++        <textarea name="resumemodeeditor_label" from="basetextarea">
++            <area>129,143,428,40</area>
++            <align>right,vcenter</align>
++            <value>Editor Resume Mode:</value>
++        </textarea>
++
++        <buttonlist name="resumemodeeditor" from="base_selector">
++            <area>567,143,550,40</area>
++        </buttonlist>
++
++        <textarea name="resumemoderadio_label" from="basetextarea">
++            <area>129,214,428,40</area>
++            <align>right,vcenter</align>
++            <value>Radio Resume Mode:</value>
++        </textarea>
++
++        <buttonlist name="resumemoderadio" from="base_selector">
++            <area>567,214,550,40</area>
++        </buttonlist>
++
++        <textarea name="jumpaction_label" from="basetextarea">
++            <area>129,285,429,30</area>
++            <align>right,vcenter</align>
++            <value>Action on Jump Point:</value>
++        </textarea>
++
++        <buttonlist name="jumpaction" from="resumemode">
++            <position>567,285</position>
+         </buttonlist>
+ 
+         <textarea name="exitaction_label" from="basetextarea">
+-            <area>315,224,300,40</area>
++            <area>129,346,428,40</area>
+             <align>right,vcenter</align>
+-            <value>Action on exit:</value>
++            <value>Action on Exit:</value>
+         </textarea>
+ 
+         <buttonlist name="exitaction" from="resumemode">
+-            <area>625,224,300,40</area>
++            <area>567,346,550,40</area>
+         </buttonlist>
+ 
+         <textarea name="autolookupcd_label" from="basetextarea">
+-            <area>315,336,300,30</area>
++            <area>129,417,428,30</area>
+             <align>right,vcenter</align>
+-            <value>Automatically lookup CDs:</value>
++            <value>Automatically Lookup CDs:</value>
+         </textarea>
+ 
+         <checkbox name="autolookupcd" from="base_checkbox">
+-            <position>625,336</position>
++            <position>567,417</position>
+         </checkbox>
+ 
+         <textarea name="autoplaycd_label" from="basetextarea">
+-            <area>315,438,300,30</area>
++            <area>129,478,428,30</area>
+             <align>right,vcenter</align>
+             <value>Automatically Play CDs:</value>
+         </textarea>
+ 
+         <checkbox name="autoplaycd" from="base_checkbox">
+-            <position>625,438</position>
++            <position>567,478</position>
+         </checkbox>
+ 
+         <textarea name="helptext" from="basetextarea">
+-            <area>239,559,802,44</area>
+-            <font>basesmallerblue</font>
++            <area>139,552,1003,66</area>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+         </textarea>
+ 
+-        <button name="save" from="base_button">
+-            <area>273,628,350,40</area>
+-            <value>Save</value>
+-        </button>
+         <button name="cancel" from="base_button">
+-            <area>657,628,350,40</area>
++            <area>233,632,350,40</area>
+             <value>Cancel</value>
+         </button>
++
++        <button name="save" from="base_button">
++            <area>697,632,350,40</area>
++            <value>Save</value>
++        </button>
+     </window>
+ 
+     <window name="ratingsettings">
+@@ -508,23 +540,22 @@
+         </spinbox>
+ 
+         <textarea name="helptext" from="basetextarea">
+-            <area>239,559,802,44</area>
+-            <font>basesmallerblue</font>
++            <area>239,553,802,50</area>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+         </textarea>
+ 
+-        <button name="save" from="base_button">
+-            <area>273,628,350,40</area>
+-            <value>Save</value>
+-        </button>
+-
+         <button name="cancel" from="base_button">
+-            <area>657,628,350,40</area>
++            <area>233,632,350,40</area>
+             <value>Cancel</value>
+         </button>
+ 
++        <button name="save" from="base_button">
++            <area>697,632,350,40</area>
++            <value>Save</value>
++        </button>
+     </window>
+ 
+     <window name="visualizationsettings">
+@@ -624,21 +655,21 @@
+ 
+         <textarea name="helptext" from="basetextarea">
+             <area>239,559,802,44</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+         </textarea>
+ 
+-        <button name="save" from="base_button">
+-            <area>273,628,350,40</area>
+-            <value>Save</value>
+-        </button>
+-
+         <button name="cancel" from="base_button">
+-            <area>657,628,350,40</area>
++            <area>233,632,350,40</area>
+             <value>Cancel</value>
+         </button>
++
++        <button name="save" from="base_button">
++            <area>697,632,350,40</area>
++            <value>Save</value>
++        </button>
+     </window>
+ 
+ </mythuitheme>
diff --git a/linhes/linhes-theme/mytharchive-ui.xml.patch b/linhes/linhes-theme/mytharchive-ui.xml.patch
new file mode 100644
index 0000000..78271f9
--- /dev/null
+++ b/linhes/linhes-theme/mytharchive-ui.xml.patch
@@ -0,0 +1,38 @@
+--- mytharchive-ui.xml.orig	2017-12-01 19:19:38.943858051 +0000
++++ mytharchive-ui.xml	2017-12-01 19:13:29.711674546 +0000
+@@ -70,7 +70,7 @@
+ 
+         <textarea name="destination_text" from="basetextarea">
+             <area>139,552,1003,66</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+@@ -549,7 +549,7 @@
+                     </statetype>
+                     <imagetype name="buttonimage">
+                         <area>28,2,77,50</area>
+-                        <filename>images/file_browser_no_preview.png</filename>
++                        <filename>images/file_browser_folder.png</filename>
+                         <preserveaspect>true</preserveaspect>
+                     </imagetype>
+                     <textarea name="buttontext">
+@@ -576,7 +576,7 @@
+                     </statetype>
+                     <imagetype name="buttonimage">
+                         <area>38,4,138,104</area>
+-                        <filename>images/file_browser_no_preview.png</filename>
++                        <filename>images/file_browser_folder.png</filename>
+                         <preserveaspect>true</preserveaspect>
+                     </imagetype>
+                     <textarea name="buttontext">
+@@ -1046,7 +1046,7 @@
+ 
+         <textarea name="logitem_text" from="basetextarea">
+             <area>139,538,1003,82</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
diff --git a/linhes/linhes-theme/mythburn-ui.xml.patch b/linhes/linhes-theme/mythburn-ui.xml.patch
new file mode 100644
index 0000000..52737e7
--- /dev/null
+++ b/linhes/linhes-theme/mythburn-ui.xml.patch
@@ -0,0 +1,20 @@
+--- mythburn-ui.xml.orig	2017-10-26 17:12:51.497611372 +0000
++++ mythburn-ui.xml	2017-10-26 17:04:02.976373390 +0000
+@@ -264,7 +264,7 @@
+ 
+         <textarea name="themedescription" from="basetextarea">
+             <area>139,552,1003,66</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
+@@ -922,7 +922,7 @@
+ 
+         <textarea name="help_text" from="basetextarea">
+             <area>139,552,1003,66</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <cutdown>yes</cutdown>
+             <align>allcenter</align>
+             <multiline>yes</multiline>
diff --git a/linhes/linhes-theme/mythnative-ui.xml.patch b/linhes/linhes-theme/mythnative-ui.xml.patch
new file mode 100644
index 0000000..18c1750
--- /dev/null
+++ b/linhes/linhes-theme/mythnative-ui.xml.patch
@@ -0,0 +1,20 @@
+--- mythnative-ui.xml.orig	2017-10-26 17:13:24.073372813 +0000
++++ mythnative-ui.xml	2017-10-26 17:04:02.976373390 +0000
+@@ -304,7 +304,7 @@
+                     </statetype>
+                     <imagetype name="buttonimage">
+                         <area>28,2,77,50</area>
+-                        <filename>images/file_browser_no_preview.png</filename>
++                        <filename>images/file_browser_folder.png</filename>
+                         <preserveaspect>true</preserveaspect>
+                     </imagetype>
+                     <textarea name="buttontext">
+@@ -331,7 +331,7 @@
+                     </statetype>
+                     <imagetype name="buttonimage">
+                         <area>38,4,138,104</area>
+-                        <filename>images/file_browser_no_preview.png</filename>
++                        <filename>images/file_browser_folder.png</filename>
+                         <preserveaspect>true</preserveaspect>
+                     </imagetype>
+                     <textarea name="buttontext">
diff --git a/linhes/linhes-theme/notification-ui.xml.patch b/linhes/linhes-theme/notification-ui.xml.patch
new file mode 100644
index 0000000..923f712
--- /dev/null
+++ b/linhes/linhes-theme/notification-ui.xml.patch
@@ -0,0 +1,385 @@
+--- notification-ui.xml.orig	2017-12-05 21:58:48.987074621 +0000
++++ notification-ui.xml	2017-12-05 22:00:42.962305760 +0000
+@@ -3,11 +3,9 @@
+ 
+ <mythuitheme>
+ 
+-    <baseres>1280x720</baseres>
+-
+     <window name="notification">
+ 
+-        <area>-1,36,780,180</area>
++        <area>800,24,470,136</area>
+ 
+         <animation trigger="AboutToShow">
+             <section>
+@@ -24,83 +22,79 @@
+         </animation>
+ 
+         <shape name="notification-backdrop" from="base_popup_backdrop">
+-            <area>0,0,780,180</area>
++            <area>0,0,470,122</area>
+         </shape>
+ 
+         <shape name="notification-backdrop-line" from="base_backdrop_line">
+-            <area>1,1,778,178</area>
++            <area>1,1,468,120</area>
+         </shape>
+ 
+         <shape name="notification-top-line" from="base_highlight_line">
+-            <area>2,2,776,2</area>
++            <area>2,2,466,2</area>
+         </shape>
+ 
+         <shape name="notification-bottom-line" from="base_highlight_line">
+-            <area>1,176,776,2</area>
++            <area>1,118,466,2</area>
+         </shape>
+ 
+         <shape name="notification-left-line" from="base_highlight_vertical_line">
+-            <area>2,4,2,170</area>
++            <area>2,4,2,112</area>
+         </shape>
+ 
+         <shape name="notification-right-line" from="base_highlight_vertical_line">
+-            <area>776,4,2,170</area>
++            <area>466,4,2,112</area>
+         </shape>
+ 
+         <textarea name="title" from="basetextarea" depends="progress">
+-            <area>14,18,752,35</area>
+-            <font>basemediumlargerbold</font>
++            <area>14,11,438,35</area>
++            <font>basemediumlargeryellow</font>
++            <scroll direction="left" startdelay="1"/>
+         </textarea>
+ 
+         <textarea name="title_noprogress" from="basetextarea" depends="!progress">
+-            <area>14,11,752,35</area>
+-            <font>basemediumlargerbold</font>
++            <area>14,11,438,35</area>
++            <font>basemediumlargeryellow</font>
+             <template>%TITLE%</template>
++            <scroll direction="left" startdelay="1"/>
+         </textarea>
+ 
+         <textarea name="origin" from="basetextarea" depends="progress">
+-            <area>14,53,752,30</area>
++            <area>14,46,438,30</area>
+             <font>basesomewhatsmaller</font>
++            <scroll direction="left" startdelay="1"/>
++            <template>[%ORIGIN%] %DESCRIPTION%</template>
+         </textarea>
+ 
+         <textarea name="origin_noprogress" from="basetextarea" depends="!progress">
+-            <area>14,46,752,30</area>
+-            <font>basesomewhatsmaller</font>
+-            <template>%ORIGIN%</template>
+-        </textarea>
+-
+-        <textarea name="description" from="basetextarea" depends="progress">
+-            <area>14,83,752,30</area>
++            <area>14,46,438,30</area>
+             <font>basesomewhatsmaller</font>
++            <scroll direction="left" startdelay="1"/>
++            <template>[%ORIGIN%]</template>
+         </textarea>
+ 
+         <textarea name="description_noprogress" from="basetextarea" depends="!progress">
+-            <area>14,76,752,90</area>
++            <area>14,76,438,30</area>
+             <font>basesomewhatsmaller</font>
+-            <multiline>yes</multiline>
+             <align>left,top</align>
++            <scroll direction="left" startdelay="1"/>
+             <template>%DESCRIPTION%</template>
+         </textarea>
+ 
+-        <textarea name="extra" from="basetextarea" depends="progress">
+-            <area>14,113,300,30</area>
+-            <font>basesomewhatsmaller</font>
+-        </textarea>
+-
+         <textarea name="progress_text" from="basetextarea" depends="progress">
+-            <area>370,113,396,30</area>
+-            <font>basesomewhatsmaller</font>
++            <area>14,72,438,30</area>
++            <font>baseevensmaller</font>
+             <align>right</align>
++            <scroll direction="left" startdelay="1"/>
+         </textarea>
+ 
+         <progressbar name="progress" from="baseprogressbar">
+-            <position>14,148</position>
++            <position>14,96</position>
+             <imagetype name="background">
+-                <area>0,0,752,10</area>
++                <area>0,0,438,10</area>
+                 <filename>images/progressbar/progressbar_background.png</filename>
+             </imagetype>
+             <imagetype name="progressimage">
+-                <area>0,0,752,10</area>
++                <area>0,0,438,10</area>
+                <filename>images/progressbar/progressbar_fill.png</filename>
+             </imagetype>
+         </progressbar>
+@@ -109,7 +103,7 @@
+ 
+     <window name="notification-image">
+ 
+-        <area>-1,36,780,180</area>
++        <area>800,24,470,136</area>
+         
+         <animation trigger="AboutToShow">
+             <section>
+@@ -126,31 +120,31 @@
+         </animation>
+ 
+         <shape name="notification-image-backdrop" from="base_popup_backdrop">
+-            <area>0,0,780,180</area>
++            <area>0,0,470,122</area>
+         </shape>
+ 
+         <shape name="notification-image-backdrop-line" from="base_backdrop_line">
+-            <area>1,1,778,178</area>
++            <area>1,1,468,120</area>
+         </shape>
+ 
+         <shape name="notification-image-top-line" from="base_highlight_line">
+-            <area>2,2,776,2</area>
++            <area>2,2,466,2</area>
+         </shape>
+ 
+         <shape name="notification-image-bottom-line" from="base_highlight_line">
+-            <area>1,176,776,2</area>
++            <area>1,118,466,2</area>
+         </shape>
+ 
+         <shape name="notification-image-left-line" from="base_highlight_vertical_line">
+-            <area>2,4,2,170</area>
++            <area>2,4,2,112</area>
+         </shape>
+ 
+         <shape name="notification-image-right-line" from="base_highlight_vertical_line">
+-            <area>776,4,2,170</area>
++            <area>466,4,2,112</area>
+         </shape>
+ 
+         <shape name="image-border">
+-            <area>14,14,152,152</area>
++            <area>352,4,114,114</area>
+             <type>roundbox</type>
+             <fill color="#000000" alpha="0" />
+             <line color="#AAAAAA" alpha="100" width="2" />
+@@ -163,9 +157,9 @@
+             <state name="noartwork">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageartwork">
+-                    <filename>images/no_artwork.png</filename>
++                    <filename>images/question.png</filename>
+                     <mask>images/masks/notification_image_mask.png</mask>
+-                    <area>18,18,144,144</area>
++                    <area>356,8,106,106</area>
+                 </imagetype>
+             </state>
+         </statetype>
+@@ -178,15 +172,15 @@
+                 <imagetype name="imageerror">
+                     <filename>images/error.png</filename>
+                     <mask>images/masks/notification_image_mask.png</mask>
+-                    <area>18,18,144,144</area>
++                    <area>356,8,106,106</area>
+                 </imagetype>
+             </state>
+             <state name="check">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageerror">
+-                    <filename>images/check.png</filename>
++                    <filename>images/checkmark.png</filename>
+                     <mask>images/masks/notification_image_mask.png</mask>
+-                    <area>18,18,144,144</area>
++                    <area>356,8,106,106</area>
+                 </imagetype>
+             </state>
+             <state name="warning">
+@@ -194,79 +188,74 @@
+                 <imagetype name="imageerror">
+                     <filename>images/warning.png</filename>
+                     <mask>images/masks/notification_image_mask.png</mask>
+-                    <area>18,18,144,144</area>
++                    <area>356,8,106,106</area>
+                 </imagetype>
+             </state>
+             <state name="busy">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imagebusy">
+-                    <filename>images/busy.png</filename>
++                    <filename>images/gears.png</filename>
+                     <mask>images/masks/notification_image_mask.png</mask>
+-                    <area>18,18,144,144</area>
++                    <area>356,8,106,106</area>
+                 </imagetype>
+             </state>
+         </statetype>
+         
+         <imagetype name="image" depends="!mediastate&amp;!errorstate">
+-            <filename>images/damaged.png</filename>
++            <filename>images/error.png</filename>
+             <mask>images/masks/notification_image_mask.png</mask>
+-            <area>18,18,144,144</area>
++            <area>356,8,106,106</area>
+         </imagetype>
+         
+         <textarea name="title" from="basetextarea" depends="progress">
+-            <area>170,18,598,35</area>
+-            <font>basemediumlargerbold</font>
++            <area>14,11,324,35</area>
++            <font>basemediumlargeryellow</font>
++            <scroll direction="left" startdelay="1"/>
+         </textarea>
+         
+         <textarea name="title_noprogress" from="basetextarea" depends="!progress">
+-            <area>170,11,598,35</area>
+-            <font>basemediumlargerbold</font>
++            <area>14,11,324,35</area>
++            <font>basemediumlargeryellow</font>
++            <scroll direction="left" startdelay="1"/>
+             <template>%TITLE%</template>
+         </textarea>
+ 
+         <textarea name="origin" from="basetextarea" depends="progress">
+-            <area>170,53,598,30</area>
++            <area>14,46,324,30</area>
+             <font>basesomewhatsmaller</font>
++            <scroll direction="left" startdelay="1"/>
++            <template>[%ORIGIN%] %DESCRIPTION%</template>
+         </textarea>
+         
+         <textarea name="origin_noprogress" from="basetextarea" depends="!progress">
+-            <area>170,46,598,30</area>
++            <area>14,46,324,30</area>
+             <font>basesomewhatsmaller</font>
+-            <template>%ORIGIN%</template>
++            <scroll direction="left" startdelay="1"/>
++            <template>[%ORIGIN%]</template>
+         </textarea>
+ 
+-        <textarea name="description" from="basetextarea" depends="progress">
+-            <area>170,83,598,30</area>
+-            <font>basesomewhatsmaller</font>
+-        </textarea>
+-        
+         <textarea name="description_noprogress" from="basetextarea" depends="!progress">
+-            <area>170,76,598,90</area>
++            <area>14,76,324,30</area>
+             <font>basesomewhatsmaller</font>
+-            <multiline>yes</multiline>
+             <align>left,top</align>
++            <scroll direction="left" startdelay="1"/>
+             <template>%DESCRIPTION%</template>
+         </textarea>
+ 
+-        <textarea name="extra" from="basetextarea" depends="progress">
+-            <area>170,113,300,30</area>
+-            <font>basesomewhatsmaller</font>
+-        </textarea>
+-        
+         <textarea name="progress_text" from="basetextarea" depends="progress">
+-            <area>370,113,398,30</area>
+-            <font>basesomewhatsmaller</font>
++            <area>14,72,324,30</area>
++            <font>baseevensmaller</font>
+             <align>right</align>
+         </textarea>
+-        
++
+         <progressbar name="progress" from="baseprogressbar">
+-            <position>170,148</position>
++            <position>14,96</position>
+             <imagetype name="background">
+-                <area>0,0,598,10</area>
++                <area>0,0,324,10</area>
+                 <filename>images/progressbar/progressbar_background.png</filename>
+             </imagetype>
+             <imagetype name="progressimage">
+-                <area>0,0,598,10</area>
++                <area>0,0,324,10</area>
+                <filename>images/progressbar/progressbar_fill.png</filename>
+             </imagetype>
+         </progressbar>
+@@ -283,12 +272,12 @@
+         </shape>
+ 
+         <statetype name="mediastate">
+-            <area>0,0,100%,100%</area>
++            <area>0,0,100%,65%</area>
+             <state name="ok"/>
+             <state name="noartwork">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageartwork">
+-                    <filename>images/no_artwork_fullscreen.png</filename>
++                    <filename>images/question.png</filename>
+                     <area>0,0,100%,100%</area>
+                     <preserveaspect>true</preserveaspect>
+                 </imagetype>
+@@ -296,12 +285,12 @@
+         </statetype>
+ 
+         <statetype name="errorstate">
+-            <area>0,0,100%,100%</area>
++            <area>0,0,100%,65%</area>
+             <state name="ok"/>
+             <state name="error">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageerror">
+-                    <filename>images/error_fullscreen.png</filename>
++                    <filename>images/error.png</filename>
+                     <area>0,0,100%,100%</area>
+                     <preserveaspect>true</preserveaspect>
+                 </imagetype>
+@@ -309,7 +298,7 @@
+             <state name="check">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageerror">
+-                    <filename>images/check_fullscreen.png</filename>
++                    <filename>images/checkmark.png</filename>
+                     <area>0,0,100%,100%</area>
+                     <preserveaspect>true</preserveaspect>
+                 </imagetype>
+@@ -317,7 +306,7 @@
+             <state name="warning">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imageerror">
+-                    <filename>images/warning_fullscreen.png</filename>
++                    <filename>images/warning.png</filename>
+                     <area>0,0,100%,100%</area>
+                     <preserveaspect>true</preserveaspect>
+                 </imagetype>
+@@ -325,7 +314,7 @@
+             <state name="busy">
+                 <area>0,0,100%,100%</area>
+                 <imagetype name="imagebusy">
+-                    <filename>images/busy_fullscreen.png</filename>
++                    <filename>images/gears.png</filename>
+                     <area>0,0,100%,100%</area>
+                     <preserveaspect>true</preserveaspect>
+                 </imagetype>
+@@ -333,14 +322,14 @@
+         </statetype>
+ 
+         <imagetype name="image" depends="!mediastate&amp;!errorstate">
+-            <filename>images/damaged_fullscreen.png</filename>
+-            <area>0,0,100%,100%</area>
+-            <preserveaspect>true</preserveaspect>
++            <filename>images/error.png</filename>
++            <mask>images/masks/notification_image_mask.png</mask>
++            <area>423,20,435,435</area>
+         </imagetype>
+ 
+         <textarea name="title" from="basetextarea">
+             <area>170,475,940,45</area>
+-            <font>baseextralargebold</font>
++            <font>baseextralargeyellow</font>
+         </textarea>
+ 
+         <textarea name="origin" from="basetextarea">
diff --git a/linhes/linhes-theme/osd.xml.patch b/linhes/linhes-theme/osd.xml.patch
new file mode 100644
index 0000000..d406747
--- /dev/null
+++ b/linhes/linhes-theme/osd.xml.patch
@@ -0,0 +1,1166 @@
+--- osd.xml.orig	2019-03-23 13:50:23.868516705 +0000
++++ osd.xml	2019-03-22 21:48:01.193894529 +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>
+@@ -199,11 +187,11 @@
+             <font>medium</font>
+             <area>670,126,200,25</area>
+             <align>right,vcenter</align>
+-            <value>Frames decoded/free :</value>
++            <value>Frames Decoded/Free :</value>
+         </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>
+@@ -238,11 +226,11 @@
+             <font>medium</font>
+             <area>994,126,130,25</area>
+             <align>right,vcenter</align>
+-            <value>Sample rate :</value>
++            <value>Sample Rate :</value>
+         </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">
+@@ -375,12 +363,359 @@
+ 
+     </window>
+ 
++    <window name="osd_navigation">
++        <fontdef name="small" face="Overlock">
++            <color>#e6e6e6</color>
++            <pixelsize>20</pixelsize>
++        </fontdef>
++
++        <fontdef name="smallgrey" from="small">
++            <color>#999999</color>
++        </fontdef>
++
++        <fontdef name="smallyellow" from="small">
++            <color>#ebb81c</color>
++        </fontdef>
++
++        <fontdef name="mediumgrey" from="smallgrey">
++            <pixelsize>28</pixelsize>
++        </fontdef>
++
++        <fontdef name="mediumyellow" from="smallyellow">
++            <pixelsize>28</pixelsize>
++        </fontdef>
++
++        <button name="more">
++            <focusorder>2</focusorder>
++            <area>1020,626,50,24</area>
++            <statetype name="buttonstate">
++                <state name="active">
++                    <textarea name="text">
++                        <area>0,0,50,24</area>
++                        <align>allcenter</align>
++                        <font>smallgrey</font>
++                        <cutdown>none</cutdown>
++                        <value>MORE</value>
++                    </textarea>
++                </state>
++                <state name="selected" from="active">
++                    <textarea name="text">
++                        <font>smallyellow</font>
++                    </textarea>
++                </state>
++                <state name="disabled" from="active" />
++                <state name="pushed" from="selected" />
++            </statetype>
++        </button>
++
++        <group name="grp0">
++            <area>260,626,760,24</area>
++
++            <button name="MENU">
++                <focusorder>2</focusorder>
++                <area>72,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>MENU</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="INFO">
++                <focusorder>2</focusorder>
++                <area>141,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>INFO</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="JUMPRWND">
++                <focusorder>2</focusorder>
++                <area>210,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,-3,64,24</area>
++                            <align>allcenter</align>
++                            <font>mediumgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>&lt;&lt;</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>mediumyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="SEEKRWND">
++                <focusorder>2</focusorder>
++                <area>279,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,-3,64,24</area>
++                            <align>allcenter</align>
++                            <font>mediumgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>&lt;</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>mediumyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="PLAY">
++                <area>348,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>PLAY</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="PAUSE">
++                <area>348,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>PAUSE</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="SEEKFFWD">
++                <area>417,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,-3,64,24</area>
++                            <align>allcenter</align>
++                            <font>mediumgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>&gt;</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>mediumyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="JUMPFFWD">
++                <area>486,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,-3,64,24</area>
++                            <align>allcenter</align>
++                            <font>mediumgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>&gt;&gt;</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>mediumyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="NEXTCC">
++                <area>555,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>CC</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="TOGGLEFILL">
++                <area>624,0,64,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,64,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>FILL</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++        </group>
++
++        <group name="grp1">
++            <area>260,626,760,24</area>
++
++            <button name="JUMPSTART">
++                <area>75,0,128,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,200,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>JUMP TO BEGINNING</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="SETBOOKMARK">
++                <area>280,0,200,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,200,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>BOOKMARK</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++            <button name="JUMPBKMRK">
++                <area>485,0,200,24</area>
++                <statetype name="buttonstate">
++                    <state name="active">
++                        <textarea name="text">
++                            <area>0,0,200,24</area>
++                            <align>allcenter</align>
++                            <font>smallgrey</font>
++                            <cutdown>none</cutdown>
++                            <value>JUMP TO BOOKMARK</value>
++                        </textarea>
++                    </state>
++                    <state name="selected" from="active">
++                        <textarea name="text">
++                            <font>smallyellow</font>
++                        </textarea>
++                    </state>
++                    <state name="disabled" from="active" />
++                    <state name="pushed" from="selected" />
++                </statetype>
++            </button>
++
++        </group>
++
++    </window>
++
+     <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 +771,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 +812,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">
++        <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">
+@@ -628,7 +970,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>WatchingLiveTM</value>
++                    <value>WatchingLiveTV</value>
+                 </textarea>
+             </state>
+             <state name="WatchingPreRecorded">
+@@ -685,7 +1027,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>AudioCodec: PCM_DVD</value>
++                    <value>AudioCodec: PCM DVD</value>
+                 </textarea>
+             </state>
+             <state name="PCM_BLURAY">
+@@ -787,7 +1129,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>Audio: Mono</value>
++                    <value>AudioChannels: Mono</value>
+                 </textarea>
+             </state>
+             <state name="2">
+@@ -805,7 +1147,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>Audio: 5 CH.</value>
++                    <value>AudioChannels: 5.0</value>
+                 </textarea>
+             </state>
+             <state name="6">
+@@ -823,7 +1165,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>Audio: 7 CH.</value>
++                    <value>AudioChannels: 7.0</value>
+                 </textarea>
+             </state>
+             <state name="8">
+@@ -832,7 +1174,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>Audio: 7.1 CH.</value>
++                    <value>AudioChannels: 7.1</value>
+                 </textarea>
+             </state>
+         </statetype>
+@@ -865,6 +1207,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>
+@@ -910,7 +1261,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>VideoDesc: SD</value>
++                    <value>VideoRes: SD</value>
+                 </textarea>
+             </state>
+             <state name="HD_720_P">
+@@ -919,7 +1270,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>VideoDesc: HD_720_P</value>
++                    <value>VideoRes: HD 720p</value>
+                 </textarea>
+             </state>
+             <state name="HD_1080_I">
+@@ -928,7 +1279,7 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>VideoDesc: HD_1080_I</value>
++                    <value>VideoRes: HD 1080i</value>
+                 </textarea>
+             </state>
+             <state name="HD_1080_P">
+@@ -937,23 +1288,32 @@
+                     <font>supersmallblue</font>
+                     <cutdown>no</cutdown>
+                     <align>allcenter</align>
+-                    <value>VideoDesc: HD_1080_P</value>
++                    <value>VideoRes: HD 1080p</value>
+                 </textarea>
+             </state>
+         </statetype>
+ 
+-        <textarea name="timedate">
++        <!--use channum to detect if in videos-->
++        <textarea name="timedate" depends="channum">
+             <font>mediumsmall</font>
+-            <area>274,453,481,24</area>
++            <area>274,453,581,24</area>
+             <align>vcenter</align>
+-            <template>%TIMEDATE% : %LENMINS%</template>
++            <template>%TIMEDATE% %LONGREPEAT%</template>
++        </textarea>
++
++        <!--use channum to detect if in videos-->
++        <textarea name="lenminsFilesize" depends="channum">
++            <font>mediumsmall</font>
++            <area>871,453,335,22</area>
++            <align>right,vcenter</align>
++            <template>%LENMINS% (%FILESIZE_STR%)</template>
+         </textarea>
+ 
+-        <textarea name="longrepeat">
++        <!--use channum to detect if in videos-->
++        <textarea name="lenmins" depends="!channum">
+             <font>mediumsmall</font>
+-            <area>771,453,435,22</area>
++            <area>871,453,335,22</area>
+             <align>right,vcenter</align>
+-            <template>%LONGREPEAT%     Size: %FILESIZE_STR%</template>
+         </textarea>
+ 
+         <imagetype name="coverart">
+@@ -988,13 +1348,22 @@
+             <alpha>255</alpha>
+         </imagetype>
+ 
+-	<textarea name="category">
++        <!--use channum to detect if in videos-->
++        <textarea name="category" depends="channum">
+             <font>supersmallblue</font>
+             <area>284,490,912,28</area>
+             <align>allcenter</align>
+             <template>Category: %CATEGORY%               PlayBackGroup: %PLAYGROUP%               RecGroup: %RECORDINGGROUP%               StorageGroup: %STORAGEGROUP%</template>
+         </textarea>
+ 
++        <!--use channum to detect if in videos-->
++        <textarea name="playback" depends="!channum">
++            <font>supersmallblue</font>
++            <area>284,490,912,28</area>
++            <align>allcenter</align>
++            <template>PlayBackGroup: %PLAYGROUP%               RecGroup: %RECORDINGGROUP%               StorageGroup: %STORAGEGROUP%</template>
++        </textarea>
++
+         <textarea name="description">
+             <font>small</font>
+             <area>284,523,912,126</area>
+@@ -1003,37 +1372,62 @@
+             <template>%"|SUBTITLE|"  %%YEARSTARS| %%DESCRIPTION%</template>
+         </textarea>
+ 
+-        <textarea name="programid">
++        <textarea name="programid" depends="channum&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="channum&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>
++
++        <!--use channum to detect if in videos-->
++        <textarea name="s00e00" depends="!channum">
++            <font>supersmallblue</font>
++            <area>2284,653,912,27</area>
++            <align>allcenter</align>
++        </textarea>
++        <textarea name="seasoneps" depends="!channum&amp;s00e00">
++            <font>supersmallblue</font>
++            <area>284,653,912,27</area>
++            <align>allcenter</align>
++            <template>Season/Episode: %s00e00%</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 +1478,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 +1486,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 +1498,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 +1545,29 @@
+         </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>
+-            <area>228,529,497,22</area>
++            <font>smaller</font>
++            <area>228,529,843,22</area>
+             <align>vcenter</align>
+-            <template>%TIMEDATE% : %LENMINS%</template>
++            <template>%TIMEDATE% %LONGREPEAT%</template>
+         </textarea>
+ 
+-        <textarea name="longrepeat">
+-            <font>smallerblue</font>
+-            <area>740,530,304,20</area>
++        <textarea name="lenmins">
++            <font>smaller</font>
++            <area>1086,530,120,22</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 +1583,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 +1593,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallblue" from="small">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <fontdef name="smallgrey" from="small">
+@@ -1232,7 +1601,7 @@
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>24</pixelsize>
++            <pixelsize>26</pixelsize>
+         </fontdef>
+ 
+         <shape name="channel-editor-backdrop">
+@@ -1610,9 +1979,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 +2032,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 +2122,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 +2132,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallyellow" from="small">
+-            <color>#d9d900</color>
++            <color>#ebb81c</color>
+         </fontdef>
+ 
+         <shape name="mythpopupbox-backdrop">
+@@ -1810,7 +2183,7 @@
+         </shape>
+ 
+         <shape name="message-area-seperator-line">
+-            <area>362,328,556,2</area>
++            <area>362,290,556,2</area>
+             <type>box</type>
+             <fill style="gradient">
+                 <gradient direction="horizontal" alpha="45">
+@@ -1822,21 +2195,21 @@
+         </shape>
+ 
+         <shape name="mythpopup-box-arrows-backdrop">
+-            <area>342,603,50,14</area>
++            <area>888,603,50,14</area>
+             <type>roundbox</type>
+-            <fill color="#000000" alpha="200" />
++            <fill color="#000000" alpha="140" />
+             <cornerradius>90</cornerradius>
+         </shape>
+ 
+         <textarea name="messagearea">
+-            <area>355,126,570,196</area>
+-            <font>smallyellow</font>
++            <area>355,126,570,158</area>
++            <font>small</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+         </textarea>
+ 
+         <buttonlist name="list">
+-            <area>347,332,586,264</area>
++            <area>347,294,586,302</area>
+             <layout>vertical</layout>
+             <spacing>4</spacing>
+             <showarrow>yes</showarrow>
+@@ -1922,7 +2295,7 @@
+                         </fill>
+                     </shape>
+                     <textarea name="buttontext">
+-                        <font>small</font>
++                        <font>smallyellow</font>
+                     </textarea>
+                     <imagetype name="buttonarrow">
+                         <alpha>255</alpha>
+@@ -1964,7 +2337,7 @@
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>2,274</position>
++                <position>548,312</position>
+                 <state type="off">
+                     <imagetype name="upon">
+                         <filename>images/osd/lists_up_arrow.png</filename>
+@@ -1978,7 +2351,7 @@
+                 </state>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>22,274</position>
++                <position>568,312</position>
+                 <state type="off">
+                     <imagetype name="dnon">
+                         <filename>images/osd/lists_down_arrow.png</filename>
diff --git a/linhes/linhes-theme/osd_subtitle.xml b/linhes/linhes-theme/osd_subtitle.xml
new file mode 100644
index 0000000..7640654
--- /dev/null
+++ b/linhes/linhes-theme/osd_subtitle.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+<mythuitheme>
+    <window name="osd_subtitle">
+        <!--
+            This is a reference implementation of the system/provider
+            defaults specified in
+            SubtitleFormat:CreateProviderDefault().
+
+            Note that if all attributes/elements are simply inherited
+            from provider, then the specification is optional.  E.g.,
+            the following could be omitted:
+
+            <fontdef name="sample" from="provider"></fontdef>
+            <shape   name="sample" from="provider"></shape>
+
+            Also note that these specific definitions are unnecessary
+            since they are the same as the defaults in the code.  A
+            theme only needs to include the definitions that it wants
+            to change/override.
+          -->
+
+        <!--
+            Define a black background which is used below for 608 and
+            text subtitles.  If a background is not used, it is
+            recommended to use a 2-pixel outline or shadow in the
+            fontdef, in order to provide sufficient contrast.  Note
+            that 708 captions providers almost always specify an
+            explicit black background.
+          -->
+        <shape name="black_background" from="provider">
+          <type>roundbox</type>
+          <cornerradius>8</cornerradius>          
+          <fill color="#000000" alpha="140" />
+        </shape>
+
+
+        <!--
+            Subtitle type "text" generally comes from external text
+            files like .srt or .txt files.
+           -->
+        <fontdef name="text" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <shape name="text" from="black_background">
+        </shape>
+
+
+        <!--
+            Digital teletext text-based subtitles.  Not to be confused
+            with bitmap teletext subtitles, or CEA-608 teletext
+            captions.  A monospaced font should be used.
+           -->
+        <fontdef name="teletext" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+
+        <!--
+            CEA-608 closed captions.  These also apply to CEA-608 VBI
+            teletext captions.  A monospaced font should be used.
+           -->
+        <fontdef name="608" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <shape name="608" from="black_background">
+        </shape>
+
+
+        <!--
+            CEA-708 closed captions.  The spec defines 8 different
+            font tags, but in practice (at least in the U.S.), only
+            tags 0 and 3 are used by broadcasters.
+           -->
+        <!-- Font tag 0: "Default" -->
+        <fontdef name="708_0" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 1: "Monospaced Serif" -->
+        <fontdef name="708_1" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 2: "Proportional Serif" -->
+        <fontdef name="708_2" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 3: "Monospaced Sans Serif" -->
+        <fontdef name="708_3" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 4: "Proportional Sans Serif" -->
+        <fontdef name="708_4" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 5: "Casual" -->
+        <fontdef name="708_5" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 6: "Cursive" -->
+        <fontdef name="708_6" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+        <!-- Font tag 7: "Small Capitals" -->
+        <!-- Note: The Qt property QFont::SmallCaps is automatically
+             applied to this font. -->
+        <fontdef name="708_7" face="Overlock" from="provider">
+            <outlinecolor>#000000</outlinecolor>
+            <outlinesize>2</outlinesize>
+            <outlinealpha>255</outlinealpha>
+        </fontdef>
+
+    </window>
+</mythuitheme>
diff --git a/linhes/linhes-theme/preview.png b/linhes/linhes-theme/preview.png
new file mode 100644
index 0000000..7c1efdb
Binary files /dev/null and b/linhes/linhes-theme/preview.png differ
diff --git a/linhes/linhes-theme/progdetails_page1.html b/linhes/linhes-theme/progdetails_page1.html
new file mode 100644
index 0000000..76ce9d0
--- /dev/null
+++ b/linhes/linhes-theme/progdetails_page1.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+    <style type="text/css">
+        body {background-color:#0a0a0e;}
+        h1 {font-family:Overlock;font-size:1.6em;font-style: normal;color:#ebb81c;margin-top: -5pt;text-align: center;}
+        h2 {font-family:Overlock;font-size:1.5em;font-style: normal;color:#ebb81c;margin-top: -5pt;text-align: center;}
+        p  {font-family:Overlock;font-size:1.4em;font-style: normal;color:#e6e6e6;margin-top: -10pt;text-align: center;}
+        hr {border:1px solid #0a0a0e;background-color:#7e8082;height:3px;margin-top: -10pt;margin-bottom: 13pt}
+        #wrap {width:100%;margin:0px auto;}
+        .col {float:left;width:33%;}
+    </style>
+</head>
+
+<body>
+    <h1>%TITLE%</h1><p>%DESCRIPTION%</p>
+    <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p>
+    <hr />
+    <div id="wrap">
+        <div class="col">
+            <h2>%ORIGINAL_AIRDATE_LABEL%</h2> <p>%ORIGINAL_AIRDATE%</p>
+            <h2>%SEASON_LABEL%/%EPISODE_LABEL%</h2> <p>S%SEASON%/E%EPISODE%</p>
+            <h2>%CATEGORY_LABEL%</h2> <p>%CATEGORY%</p>
+            <h2>%CATEGORY_TYPE_LABEL%</h2> <p>%CATEGORY_TYPE%</p>
+            <h2>%PROGRAMID_LABEL%</h2> <p>%PROGRAMID%</p>
+            <h2>%MYTHTV_STATUS_LABEL%</h2> <p>%MYTHTV_STATUS%</p>
+            <h2>%RECORDING_RULE_LABEL%</h2> <p>%RECORDING_RULE%</p>
+            <h2>%SEARCH_PHRASE_LABEL%</h2> <p>%SEARCH_PHRASE%</p>
+            <h2>%RECORDED_FILE_NAME_LABEL%</h2> <p>%RECORDED_FILE_NAME%</p>
+            <h2>%RECORDED_FILE_SIZE_LABEL%</h2> <p>%RECORDED_FILE_SIZE%</p>
+        </div>
+        <div class="col">
+            <h2>%RECORDING_PROFILE_LABEL%</h2> <p>%RECORDING_PROFILE%</p>
+            <h2>%RECORDING_GROUP_LABEL%</h2> <p>%RECORDING_GROUP%</p>
+            <h2>%STORAGE_GROUP_LABEL%</h2> <p>%STORAGE_GROUP%</p>
+            <h2>%PLAYBACK_GROUP_LABEL%</h2> <p>%PLAYBACK_GROUP%</p>
+            <h2>%LAST_RECORDED_LABEL%</h2> <p>%LAST_RECORDED%</p>
+            <h2>%NEXT_RECORDING_LABEL%</h2> <p>%NEXT_RECORDING%</p>
+            <h2>%AVERAGE_TIME_SHIFT_LABEL%</h2> <p>%AVERAGE_TIME_SHIFT%</p>
+            <h2>%WATCH_LIST_SCORE_LABEL%</h2> <p>%WATCH_LIST_SCORE%</p>
+            <h2>%WATCH_LIST_STATUS_LABEL%</h2> <p>%WATCH_LIST_STATUS%</p>
+            <h2>%FINDID_LABEL%</h2> <p>%FINDID%</p>
+            <h2>%RECORDING_HOST_LABEL%</h2> <p>%RECORDING_HOST%</p>
+            <h2>%RECORDING_INPUT_LABEL%</h2> <p>%RECORDING_INPUT%</p>
+        </div>
+        <div class="col">
+            <h2>%ACTORS_LABEL%</h2> <p>%ACTORS%</p>
+            <h2>%GUEST_STAR_LABEL%</h2> <p>%GUEST_STAR%</p>
+            <h2>%GUEST_LABEL%</h2> <p>%GUEST%</p>
+            <h2>%DIRECTOR_LABEL%</h2> <p>%DIRECTOR%</p>
+            <h2>%PRODUCER_LABEL%</h2> <p>%PRODUCER%</p>
+            <h2>%EXECUTIVE_PRODUCER_LABEL%</h2> <p>%EXECUTIVE_PRODUCER%</p>
+            <h2>%WRITER_LABEL%</h2> <p>%WRITER%</p>
+            <h2>%HOST_LABEL%</h2> <p>%HOST%</p>
+            <h2>%ADAPTER_LABEL%</h2> <p>%ADAPTER%</p>
+            <h2>%PRESENTER_LABEL%</h2> <p>%PRESENTER%</p>
+            <h2>%COMMENTATOR_LABEL%</h2> <p>%COMMENTATOR%</p>
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/linhes/linhes-theme/qtlook.txt.patch b/linhes/linhes-theme/qtlook.txt.patch
new file mode 100644
index 0000000..7435db4
--- /dev/null
+++ b/linhes/linhes-theme/qtlook.txt.patch
@@ -0,0 +1,11 @@
+--- qtlook.txt.orig	2014-01-02 21:32:43.941375600 +0000
++++ qtlook.txt	2014-01-02 21:32:57.946243387 +0000
+@@ -3,7 +3,7 @@
+ # Color of lines, text, etc
+ str ForegroundColor=1a1a1a
+ # Pixmap to use for the background
+-str BackgroundPixmap=images/backgrounds/qt-background.png
++str BackgroundPixmap=images/backgrounds/background.png
+ str Font=DejaVu Sans
+ 
+ # Forground for dialogs
diff --git a/linhes/linhes-theme/question.png b/linhes/linhes-theme/question.png
new file mode 100644
index 0000000..1eda678
Binary files /dev/null and b/linhes/linhes-theme/question.png differ
diff --git a/linhes/linhes-theme/readme.txt.patch b/linhes/linhes-theme/readme.txt.patch
new file mode 100644
index 0000000..f82817d
--- /dev/null
+++ b/linhes/linhes-theme/readme.txt.patch
@@ -0,0 +1,29 @@
+--- readme.txt.orig	2014-05-27 19:56:48.714421419 +0000
++++ readme.txt	2014-05-27 19:58:12.880315485 +0000
+@@ -1,26 +1,9 @@
+-Backgrounds.
+-
+-If the default background is too light for you there is a darker version located
+-in images/backgrounds/dark/.
+-
+-If the default background is too dark for you there is a lighter version located
+-in images/backgrounds/light/.
+-
+-You can just copy them over to the images/backgrounds/ directory.
+-I actually use the darker version myself as my tv is set pretty bright but it is too dark
+-for computer monitors.
+-
+ Alternate osd.
+ There is an alternate osd available for anybody that doesn't like the default. ( osd.xml.alt )
+ I use the alternate osd myself.
+ To use just move the default osd to osd.xml.orig and copy the osd.xml.alt to osd.xml.
+ Example mv osd.xml osd.xml.orig and cp osd.xml.alt osd.xml.
+ 
+-Alternate vertical main menu.
+-There is an alternate main menu using a vertical layout rather than the default horizontal layout.
+-To use just backup main-ui.xml. Example cp menu-ui.xml menu-ui.xml.bak.
+-Then cp menu-ui-vert.xml to menu-ui.xml.
+-
+ Color text in lists.
+ 
+ There are two types of lists in the theme.
diff --git a/linhes/linhes-theme/recordings-ui.xml.patch b/linhes/linhes-theme/recordings-ui.xml.patch
new file mode 100644
index 0000000..205d671
--- /dev/null
+++ b/linhes/linhes-theme/recordings-ui.xml.patch
@@ -0,0 +1,176 @@
+--- recordings-ui.xml.orig	2018-05-25 17:44:18.266763054 +0000
++++ recordings-ui.xml	2019-03-24 22:52:51.874815241 +0000
+@@ -105,19 +105,11 @@
+         </shape>
+ 
+         <shape name="description-seperator-top-line" from="base_line">
+-            <area>188,487,684,2</area>
++            <area>37,487,835,2</area>
+         </shape>
+ 
+         <shape name="description-seperator-bottom-line" from="base_line">
+-            <area>188,643,684,2</area>
+-        </shape>
+-
+-        <shape name="coverart-border">
+-            <area>37,464,136,204</area>
+-            <type>roundbox</type>
+-            <fill color="#000000" alpha="0" />
+-            <line color="#AAAAAA" alpha="100" width="2" />
+-            <cornerradius>6</cornerradius>
++            <area>37,643,835,2</area>
+         </shape>
+ 
+         <shape name="preview-border">
+@@ -194,6 +186,7 @@
+                     <textarea name="buttontext">
+                         <area>8,0,284,64</area>
+                         <align>allcenter</align>
++                        <font>basesmaller</font>
+                         <multiline>yes</multiline>
+                     </textarea>
+                 </state>
+@@ -218,6 +211,7 @@
+                    </textarea>
+                     <textarea name="shortstartdate" from="titlesubtitle">
+                         <area>720,0,80,30</area>
++                        <cutdown>no</cutdown>
+                         <align>right,vcenter</align>
+                     </textarea>
+                     <textarea name="filesize_str" from="base_text_font_state_extrasmall">
+@@ -232,16 +226,17 @@
+                     <area>0,0,898,64</area>
+                     <textarea name="titlesubtitle" from="base_text_font_state_small">
+                         <area>8,2,694,24</area>
+-                        <font state="normal">basesmall</font>
++                        <font state="normal">basesmallyellow</font>
+                         <align>vcenter</align>
+                     </textarea>
+                     <textarea name="shortstartdate" from="titlesubtitle">
+-                        <area>720,3,80,24</area>
++                        <area>720,2,80,24</area>
++                        <cutdown>no</cutdown>
+                         <align>right,vcenter</align>
+                     </textarea>
+                     <textarea name="filesize_str" from="base_text_font_state_extrasmall">
+-                        <area>818,7,72,18</area>
+-                        <font state="normal">baseextrasmall</font>
++                        <area>818,2,72,24</area>
++                        <font state="normal">baseextrasmallyellow</font>
+                         <cutdown>no</cutdown>
+                         <align>right,vcenter</align>
+                     </textarea>
+@@ -579,20 +574,20 @@
+                         <align>allcenter</align>
+                     </textarea>
+                     <textarea name="s00e00" from="base_text_font_state_extrasmall">
+-                        <area>500,42,70,20</area>
++                        <area>500,42,80,20</area>
+                         <font state="normal">baseextrasmall</font>
+                         <cutdown>no</cutdown>
+                         <align>allcenter</align>
+                     </textarea>
+                     <textarea name="syndicatedepisode" from="base_text_font_state_extrasmall" depends="!s00e00">
+-                        <area>500,42,70,20</area>
++                        <area>500,42,80,20</area>
+                         <font state="normal">baseextrasmall</font>
+                         <cutdown>no</cutdown>
+                         <align>allcenter</align>
+                         <template>%|[SYNDICATEDEPISODE|]%</template>
+                     </textarea>
+                     <textarea name="timedate" from="base_text_font_state_extrasmall">
+-                        <area>575,42,315,20</area>
++                        <area>585,42,305,20</area>
+                         <font state="normal">baseextrasmall</font>
+                         <align>right,vcenter</align>
+                     </textarea>
+@@ -606,60 +601,51 @@
+             </statetype>
+         </buttonlist>
+ 
+-        <imagetype name="no_coverart_without_fanart" depends="!fanart">
+-            <area>41,468,128,196</area>
+-            <filename>images/no_coverart.png</filename>
+-            <mask>images/masks/watchrecordings_coverart_mask.png</mask>
+-            <preserveaspect>false</preserveaspect>
+-            <alpha>255</alpha>
+-        </imagetype>
+-
+-        <imagetype name="no_coverart_with_fanart" depends="fanart">
+-            <area>41,468,128,196</area>
+-            <filename>images/no_coverart_with_fanart.png</filename>
+-            <mask>images/masks/watchrecordings_coverart_mask.png</mask>
++        <imagetype name="coverart_mask" depends="coverart">
++            <area>28,93,300,338</area>
++            <filename>images/blank_coverart.png</filename>
+             <preserveaspect>false</preserveaspect>
+             <alpha>255</alpha>
+         </imagetype>
+ 
+         <imagetype name="coverart">
+-            <area>41,468,128,196</area>
+-            <mask>images/masks/watchrecordings_coverart_mask.png</mask>
+-            <preserveaspect>false</preserveaspect>
++            <area>28,93,300,338</area>
++            <preserveaspect>true</preserveaspect>
+             <alpha>255</alpha>
+         </imagetype>
+ 
++
+         <textarea name="title" from="basetextarea">
+-            <area>189,451,682,36</area>
++            <area>38,451,833,36</area>
+             <font>basemediumyellow</font>
+             <align>left,vcenter</align>
+             <template>%TITLE% %|(CATEGORY|)%</template>
+         </textarea>
+ 
+         <textarea name="description2" from="basetextarea">
+-            <area>189,498,682,140</area>
++            <area>38,498,833,140</area>
+             <multiline>yes</multiline>
+             <cutdown>yes</cutdown>
+             <template>%"|SUBTITLE|" %%YEARSTARS| %%DESCRIPTION%</template>
+         </textarea>
+         
+         <progressbar name="usedbar" from="baseprogressbar">
+-            <position>189,659</position>
++            <position>38,659</position>
+             <imagetype name="background">
+-                <area>0,0,682,8</area>
++                <area>0,0,833,8</area>
+                 <filename>images/progressbar/progressbar_background.png</filename>
+             </imagetype>
+             <imagetype name="progressimage">
+-                <area>0,0,682,8</area>
++                <area>0,0,833,8</area>
+                <filename>images/progressbar/progressbar_fill.png</filename>
+             </imagetype>
+         </progressbar>
+ 
+         <textarea name="freereport" from="basetextarea">
+-            <area>189,665,682,20</area>
++            <area>38,665,833,20</area>
+             <font>basesupersmallyellow</font>
+             <align>allcenter</align>
+-            <template>Disk space:  %1</template>
++            <template>Disk Space:  %1</template>
+         </textarea>
+ 
+         <imagetype name="no_preview_image_without_fanart" depends="!fanart">
+@@ -685,12 +671,10 @@
+             <alpha>255</alpha>
+         </imagetype>
+ 
+-        <textarea name="norecordings">
+-            <area>350,87,906,351</area>
+-            <font>basemedium</font>
+-            <value>No Recordings available, or screen loading...</value>
++        <textarea name="norecordings" from="basetextarea">
++            <area>38,498,833,140</area>
+             <multiline>yes</multiline>
+-            <align>allcenter</align>
++            <value>No recordings are available.</value>
+         </textarea>
+ 
+         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
diff --git a/linhes/linhes-theme/schedule-ui.xml.patch b/linhes/linhes-theme/schedule-ui.xml.patch
new file mode 100644
index 0000000..33d6119
--- /dev/null
+++ b/linhes/linhes-theme/schedule-ui.xml.patch
@@ -0,0 +1,262 @@
+--- schedule-ui.xml.orig	2018-06-06 17:48:28.091163462 +0000
++++ schedule-ui.xml	2019-03-11 20:58:29.671094834 +0000
+@@ -119,14 +119,14 @@
+             <channels>6</channels>
+             <timeslots>5</timeslots>
+             <solidcolor>#003256</solidcolor>
+-            <selector type="roundbox" linecolor="#d6d6d6" />
++            <selector type="highlight" linecolor="#e6e6e6" fillcolor="#000000"/>
+             <showcategories>yes</showcategories>
+             <categoryalpha>130</categoryalpha>
+-            <recordingcolor>#00aa00</recordingcolor>
+-            <conflictingcolor>#ff6600</conflictingcolor>
++            <recordingcolor>#80d400</recordingcolor>
++            <conflictingcolor>#d97616</conflictingcolor>
+             <cutdown>no</cutdown>
+             <multiline>yes</multiline>
+-            <textoffset>6,7</textoffset>
++            <textoffset>6,2</textoffset>
+             <recordstatus type="SingleRecord" image="images/gg-rs-single.png"></recordstatus>
+             <recordstatus type="TimeslotRecord" image="images/gg-rs-timeslot.png"></recordstatus>
+             <recordstatus type="ChannelRecord" image="images/gg-rs-channel.png"></recordstatus>
+@@ -134,8 +134,8 @@
+             <recordstatus type="WeekslotRecord" image="images/gg-rs-weekslot.png"></recordstatus>
+             <recordstatus type="FindOneRecord" image="images/gg-rs-findone.png"></recordstatus>
+             <recordstatus type="OverrideRecord" image="images/gg-rs-override.png"></recordstatus>
+-            <arrow direction="left" image="images/gg-arrow-left.png"></arrow>
+-            <arrow direction="right" image="imaages/gg-arrow-right.png"></arrow>
++            <arrow direction="left" image="images/gg-left-arrow-large.png"></arrow>
++            <arrow direction="right" image="images/gg-right-arrow-large.png"></arrow>
+             <font>basesmall</font>
+         </guidegrid>
+ 
+@@ -146,7 +146,7 @@
+             <buttonarea>0,0,1019,41</buttonarea>
+             <statetype name="buttonitem">
+                 <state name="active">
+-                    <area>-1,0,203,41</area>
++                    <area>0,0,203,41</area>
+                     <shape name="separator" from="base_vertical_line">
+                         <area>0,5,2,31</area>
+                     </shape>
+@@ -301,7 +301,7 @@
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+-            <value>Program Guide Video</value>
++            <value>Program Guide</value>
+         </textarea>
+ 
+         <shape name="guide-top-backdrop" from="base_backdrop">
+@@ -434,14 +434,14 @@
+             <channels>5</channels>
+             <timeslots>5</timeslots>
+             <solidcolor>#003256</solidcolor>
+-            <selector type="roundbox" linecolor="#d6d6d6" />
++            <selector type="highlight" linecolor="#e6e6e6" fillcolor="#000000"/>
+             <showcategories>yes</showcategories>
+             <categoryalpha>130</categoryalpha>
+-            <recordingcolor>#00aa00</recordingcolor>
+-            <conflictingcolor>#ff6600</conflictingcolor>
++            <recordingcolor>#80d400</recordingcolor>
++            <conflictingcolor>#d97616</conflictingcolor>
+             <cutdown>no</cutdown>
+             <multiline>yes</multiline>
+-            <textoffset>6,7</textoffset>
++            <textoffset>6,2</textoffset>
+             <recordstatus type="SingleRecord" image="images/gg-rs-single.png"></recordstatus>
+             <recordstatus type="TimeslotRecord" image="images/gg-rs-timeslot.png"></recordstatus>
+             <recordstatus type="ChannelRecord" image="images/gg-rs-channel.png"></recordstatus>
+@@ -449,24 +449,24 @@
+             <recordstatus type="WeekslotRecord" image="images/gg-rs-weekslot.png"></recordstatus>
+             <recordstatus type="FindOneRecord" image="images/gg-rs-findone.png"></recordstatus>
+             <recordstatus type="OverrideRecord" image="images/gg-rs-override.png"></recordstatus>
+-            <arrow direction="left" image="images/gg-arrow-left.png"></arrow>
+-            <arrow direction="right" image="imaages/gg-arrow-right.png"></arrow>
++            <arrow direction="left" image="images/gg-left-arrow-large.png"></arrow>
++            <arrow direction="right" image="images/gg-right-arrow-large.png"></arrow>
+             <font>basesmall</font>
+         </guidegrid>
+ 
+         <buttonlist name="timelist">
+-            <area>238,40,1019,42</area>
++            <area>238,40,1019,41</area>
+             <layout>horizontal</layout>
+             <spacing>0</spacing>
+-            <buttonarea>0,0,1019,42</buttonarea>
++            <buttonarea>0,0,1019,41</buttonarea>
+             <statetype name="buttonitem">
+                 <state name="active">
+-                    <area>-1,0,203,42</area>
++                    <area>0,0,203,41</area>
+                     <shape name="separator" from="base_vertical_line">
+-                        <area>0,5,2,30</area>
++                        <area>0,5,2,31</area>
+                     </shape>
+                     <textarea name="buttontext" from="basetextarea">
+-                        <area>0,0,203,42</area>
++                        <area>0,1,203,41</area>
+                         <font>basesmall</font>
+                         <align>allcenter</align>
+                     </textarea>
+@@ -1084,7 +1084,7 @@
+ 
+         <textarea name="helptext">
+             <area>0,39,1280,34</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+             <value>(1) Channel (2) Priority</value>
+         </textarea>
+@@ -1437,10 +1437,10 @@
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>0,350</position>
++                <position>550,350</position>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>20,350</position>
++                <position>570,350</position>
+             </statetype>
+         </buttonlist>
+ 
+@@ -1544,10 +1544,10 @@
+             </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>0,350</position>
++                <position>550,350</position>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>20,350</position>
++                <position>570,350</position>
+             </statetype>
+         </buttonlist>
+ 
+@@ -1854,7 +1854,7 @@
+ 
+     </window>
+ 
+-    <window name="progdetails">
++    <window name="programdetails">
+         <area>0,0,1280,720</area>
+ 
+         <textarea name="heading" from="base_heading">
+@@ -1885,12 +1885,90 @@
+             <area>1256,40,2,641</area>
+         </shape>
+ 
+-        <webbrowser name="browser">
++        <shape name="arrows-backdrop" from="base_arrows_backdrop">
++            <area>1210,685,50,13</area>
++        </shape>
++
++        <buttonlist name="infolist">
++            <layout>vertical</layout>
++            <spacing>4</spacing>
++            <arrange>stack</arrange>
++            <wrapstyle>items</wrapstyle>
++            <align>top</align>
+             <area>26,42,1228,637</area>
+-            <zoom>1.0</zoom>
+-            <background color="#000000" alpha="1"/>
+-        </webbrowser>
++            <buttonarea>0,0,100%,100%</buttonarea>
++
++            <statetype name="buttonitem">
++                <area>0,0,100%,124</area>
++                <minsize shrink="short">100%,5</minsize>
++                <state name="active">
++                    <area>0,0,100%,100%</area>
++                    <minsize shrink="short">100%,6</minsize>
++                    <shape name="background">
++                        <!-- work around a stack / minsize display bug by using
++                             empty image to help spacing -->
++                        <area>0,0,100%,100%</area>
++                        <minsize shrink="short">100%,5</minsize>
++                    </shape>
++                    <textarea name="name" from="basetextarea">
++                        <area>5,3,24%,-3</area>
++                        <minsize shrink="short">100%,5</minsize>
++                        <multiline>yes</multiline>
++                        <cutdown>no</cutdown>
++                        <align>top,right</align>
++                        <font>basesmallblue</font>
++                    </textarea>
++                    <textarea name="sep">
++                        <area>25%,3,10,-3</area>
++                        <minsize shrink="short">100%,5</minsize>
++                        <align>top,left</align>
++                        <value>:</value>
++                        <font>basesmallblue</font>
++                    </textarea>
++                    <textarea name="value">
++                        <area>25%+15,3,-10,-3</area>
++                        <minsize shrink="short">100%,5</minsize>
++                        <multiline>yes</multiline>
++                        <cutdown>no</cutdown>
++                        <align>top,left</align>
++                        <font>basesmall</font>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active" />
++                <state name="selectedinactive" from="active" />
++            </statetype>
+ 
++            <statetype name="upscrollarrow">
++                <position>1192,645</position>
++                <state type="off">
++                    <imagetype name="upoff">
++                        <filename>images/lists_up_arrow.png</filename>
++                        <alpha>80</alpha>
++                    </imagetype>
++                </state>
++                <state type="full">
++                    <imagetype name="upon">
++                        <filename>images/lists_up_arrow.png</filename>
++                        <alpha>200</alpha>
++                    </imagetype>
++                </state>
++            </statetype>
++           <statetype name="downscrollarrow">
++                <position>1212,645</position>
++                <state type="off">
++                    <imagetype name="dnoff">
++                        <filename>images/lists_down_arrow.png</filename>
++                        <alpha>80</alpha>
++                    </imagetype>
++                </state>
++                <state type="full">
++                    <imagetype name="dnon">
++                        <filename>images/lists_down_arrow.png</filename>
++                        <alpha>200</alpha>
++                    </imagetype>
++                </state>
++            </statetype>
++        </buttonlist>
+     </window>
+ 
+     <window name="searchpopup">
+@@ -3098,10 +3176,10 @@
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+-                <position>0,350</position>
++                <position>550,350</position>
+             </statetype>
+             <statetype name="downscrollarrow">
+-                <position>20,350</position>
++                <position>570,350</position>
+             </statetype>
+         </buttonlist>
+ 
+@@ -3583,7 +3661,7 @@
+             <area>112,65,180,40</area>
+             <font>basesmall</font>
+             <align>right,vcenter</align>
+-            <value>TMDB/TVDB #:</value>
++            <value>Video #:</value>
+         </textarea>
+ 
+         <textedit name="inetref_edit" from="base_textedit">
diff --git a/linhes/linhes-theme/settings-ui.xml.patch b/linhes/linhes-theme/settings-ui.xml.patch
new file mode 100644
index 0000000..d7b082a
--- /dev/null
+++ b/linhes/linhes-theme/settings-ui.xml.patch
@@ -0,0 +1,11 @@
+--- settings-ui.xml.orig	2017-10-26 17:20:33.167538071 +0000
++++ settings-ui.xml	2017-10-26 17:04:02.976373390 +0000
+@@ -103,7 +103,7 @@
+ 
+         <textarea name="label-text" from="basetextarea">
+             <area>244,470,792,69</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
diff --git a/linhes/linhes-theme/standardsetting-ui.xml b/linhes/linhes-theme/standardsetting-ui.xml
new file mode 100644
index 0000000..75ff02f
--- /dev/null
+++ b/linhes/linhes-theme/standardsetting-ui.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+
+<mythuitheme>
+    <window name="settingssetup">
+        <textarea name="title" from="base_heading">
+            <value>Settings</value>
+        </textarea>
+
+        <shape name="settings-list-backdrop" from="base_backdrop">
+            <area>20,36,1240,488</area>
+        </shape>
+
+        <shape name="settings-list-backdrop-line" from="base_backdrop_line">
+            <area>21,37,1238,484</area>
+        </shape>
+
+        <shape name="settings-list-top-line" from="base_highlight_line">
+            <area>22,38,1236,2</area>
+        </shape>
+
+        <shape name="settings-list-bottom-line" from="base_highlight_line">
+            <area>22,518,1236,2</area>
+        </shape>
+
+        <shape name="settings-list-left-line" from="base_highlight_vertical_line">
+            <area>22,40,2,476</area>
+        </shape>
+
+        <shape name="settings-list-right-line" from="base_highlight_vertical_line">
+            <area>1256,40,2,476</area>
+        </shape>
+
+        <shape name="settings-list-arrows-backdrop" from="base_arrows_backdrop">
+            <area>1207,522,50,11</area>
+        </shape>
+
+        <shape name="settings-bottom-backdrop" from="base_backdrop">
+            <area>20,532,1240,154</area>
+        </shape>
+
+        <shape name="settings-bottom-backdrop-line" from="base_backdrop_line">
+            <area>21,533,1238,150</area>
+        </shape>
+
+        <shape name="settings-bottom-top-line" from="base_highlight_line">
+            <area>22,534,1236,2</area>
+        </shape>
+
+        <shape name="settings-bottom-bottom-line" from="base_highlight_line">
+            <area>22,680,1236,2</area>
+        </shape>
+
+        <shape name="settings-bottom-left-line" from="base_highlight_vertical_line">
+            <area>22,536,2,146</area>
+        </shape>
+
+        <shape name="settings-bottom-right-line" from="base_highlight_vertical_line">
+            <area>1256,536,2,146</area>
+        </shape>
+
+        <shape name="settings-bottom-seperator-first-line" from="base_line">
+            <area>43,609,1194,2</area>
+        </shape>
+
+        <buttonlist name="settingslist" from="base_list">
+            <area>28,43,1224,472</area>
+            <layout>vertical</layout>
+            <spacing>4</spacing>
+            <scrollstyle>free</scrollstyle>
+            <arrange>stack</arrange>
+            <wrapstyle>items</wrapstyle>
+            <buttonarea>0,0,100%,100%</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,1224,30</area>
+                    <group name="select_bar" from="base_select_bar_active_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+
+                    <textarea name="buttontext">
+                        <area>25,0,50%-5,30</area>
+                    </textarea>
+                   
+                    <group name="widgets">
+                        <area>50%+5,0,100%,100%</area>
+                        <statetype name="widgettype">
+                            <area>0,0,100%-24,100%</area>
+                            <state name="standard">
+                                <area>0,0,100%,100%</area> 
+                            </state>
+                            <state name="group">
+                                <area>0,0,100%,100%</area> 
+                            </state>
+                            <state name="checkbox">
+                                <area>0,0,100%,100%</area> 
+                            </state>
+                            <state name="textedit">
+                                <area>0,0,100%,100%</area> 
+                                <group name="texteditgroup">
+                                    <area>0,0,100%,100%</area>
+                                </group>
+                            </state>
+                            <state name="filebrowser">
+                                <area>0,0,100%,100%</area>
+                            </state>
+                            <state name="spinbox" from="textedit" />
+                            <state name="combobox" from="textedit" />
+                            <state name="button">
+                                <area>0,0,100%,100%</area>
+                            </state>
+                        </statetype>
+                        <!-- we can not put more than one textarea with the same name
+                            The textarea can no be in a custom state 
+                            We can not put the textarea in a state from statetype neither
+                            Which mean we can not theme them differently according to the statetype
+                        -->
+                        <textarea name="value">
+                            <area>5,0,100%-35,100%</area>
+                            <font>basesmall</font>
+                            <cutdown>yes</cutdown>
+                            <align>right,vcenter</align>
+                        </textarea>
+                    </group>
+
+                    <statetype name="buttoncheck">
+                        <position>100%-56,50%-15</position>
+                        <state type="off">
+                            <imagetype name="checkoff">
+                                <filename>images/unchecked.png</filename>
+                            </imagetype>
+                        </state>
+                        <state type="half">
+                            <imagetype name="checkhalf">
+                                <filename>images/checked.png</filename>
+                            </imagetype>
+                        </state>
+                        <state type="full">
+                            <imagetype name="checkfull">
+                                <filename>images/checked_selected.png</filename>
+                            </imagetype>
+                        </state>
+                    </statetype>
+
+                    <imagetype name="buttonarrow">
+                        <position>100%-20,50%-8</position>
+                        <filename>images/lists_right_arrow.png</filename>
+                    </imagetype>
+                </state>
+ 
+               <state name="selectedactive" from="active">
+                    <area>0,0,1224,64</area>
+                    <group name="select_bar" from="base_select_bar_selectedactive_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+
+                    <imagetype name="parentarrow">
+                        <position>5,50%-15</position>
+                        <filename>images/lists_left_arrow_large.png</filename>
+                    </imagetype>
+
+                    <textarea name="buttontext">
+                        <area>25,0,1194,64</area>
+                        <font>basesmallyellow</font>
+                        <align>left,vcenter</align>
+                        <scroll direction="horizontal" />
+                    </textarea>
+
+                    <group name="widgets">
+                        <statetype name="widgettype">
+                            <state name="textedit">
+                                <area>0,0,100%,100%</area> 
+                                <group name="texteditgroup" from="base_textedit_select_bar_selectedactive_group">
+                                    <area>0,5%,100%,95%</area>
+                                </group>
+                            </state>
+                            <state name="filebrowser">
+                                <area>0,0,100%,100%</area>
+                                <group name="filebrowsergroup" from="base_textedit_select_bar_selectedactive_group">
+                                    <area>0,5%,100%,95%</area>
+                                </group>
+                            </state>
+                            <state name="spinbox" from="textedit" />
+                            <state name="combobox" from="textedit" />
+                            <state name="standard">
+                                <area>0,0,100%,100%</area>
+                                <group name="buttongroup" from="base_textedit_select_bar_selectedactive_group">
+                                    <area>100%-150,5%,100%,95%</area>
+                                </group>
+                                <textarea name="buttonpress">
+                                    <area>100%-150,0,100%,100%</area>
+                                    <font>basesmallyellow</font>
+                                    <cutdown>yes</cutdown>
+                                    <align>allcenter</align>
+                                    <value>OK</value>
+                                </textarea>
+                            </state>
+                        </statetype>
+                        <textarea name="value">
+                            <font>basesmallyellow</font>
+                            <scroll direction="horizontal" />
+                        </textarea>
+                    </group>
+
+                    <statetype name="buttoncheck">
+                       <shape name="select_bar_top_highlight">
+                            <area>0,-1,100%,2</area>
+                            <type>box</type>
+                            <fill style="gradient">
+                                <gradient direction="horizontal" alpha="255">
+                                    <stop position="0" color="#000000"/>
+                                    <stop position="50" color="#d6d6d6"/>
+                                    <stop position="100" color="#000000"/>
+                                </gradient>
+                            </fill>
+                        </shape>
+                        <shape name="select_bar_bottom_highlight">
+                            <area>0,100%-1,100%,2</area>
+                            <type>box</type>
+                            <fill style="gradient">
+                                <gradient direction="horizontal" alpha="255">
+                                    <stop position="0" color="#000000"/>
+                                    <stop position="50" color="#d6d6d6"/>
+                                    <stop position="100" color="#000000"/>
+                                </gradient>
+                            </fill>
+                        </shape>
+                        <shape name="select_bar_left_highlight">
+                            <area>-1,0,2,100%</area>
+                            <type>box</type>
+                            <fill style="gradient">
+                                <gradient direction="vertical" alpha="255">
+                                    <stop position="0" color="#000000"/>
+                                    <stop position="50" color="#3a9aff"/>
+                                    <stop position="100" color="#000000"/>
+                                </gradient>
+                            </fill>
+                        </shape>
+                        <shape name="select_bar_right_highlight">
+                            <area>100%-1,0,2,100%</area>
+                            <type>box</type>
+                            <fill style="gradient">
+                                <gradient direction="vertical" alpha="255">
+                                    <stop position="0" color="#000000"/>
+                                    <stop position="50" color="#3a9aff"/>
+                                    <stop position="100" color="#000000"/>
+                                </gradient>
+                            </fill>
+                        </shape>
+                    </statetype>
+
+                    <imagetype name="buttonarrow">
+                        <position>100%-23,50%-15</position>
+                        <filename>images/lists_right_arrow_large.png</filename>
+                    </imagetype>
+                </state>
+                <state name="disabledactive" from="active">
+                    <textarea name="buttontext">
+                        <font>basesmalllightgrey</font>
+                    </textarea>
+                    <group name="widgets">
+                        <textarea name="value">
+                            <font>basesmalllightgrey</font>
+                        </textarea>
+                    </group>
+                </state>
+                <state name="disabledinactive" from="disabledactive">
+                </state>
+                <state name="selectedinactive" from="active">
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>1186,479</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>1206,479</position>
+            </statetype>
+        </buttonlist>
+
+        <!-- optional, display the help for the currently selected setting -->
+        <textarea name="selectedsettinghelp" from="basetextarea">
+            <area>44,545,1192,55</area>
+            <font>basesmallyellow</font>
+            <align>allcenter</align>
+            <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
+        </textarea>
+
+        <!-- optional, display the help for the current group of settings -->
+        <textarea name="grouphelp" from="basetextarea">
+            <area>44,618,1192,55</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+            <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
+        </textarea>
+
+    </window>
+
+    <window name="terminal">
+        <textarea name="heading" from="base_heading">
+            <value>Terminal</value>
+        </textarea>
+
+        <shape name="terminal-backdrop" from="base_backdrop">
+            <area>115,36,1050,488</area>
+        </shape>
+
+        <shape name="terminal-backdrop-line" from="base_backdrop_line">
+            <area>116,37,1048,486</area>
+        </shape>
+
+        <shape name="terminal-top-line" from="base_highlight_line">
+            <area>117,38,1046,2</area>
+        </shape>
+
+        <shape name="terminal-bottom-line" from="base_highlight_line">
+            <area>117,520,1046,2</area>
+        </shape>
+
+        <shape name="terminal-left-line" from="base_highlight_vertical_line">
+            <area>117,40,2,500</area>
+        </shape>
+
+        <shape name="terminal-right-line" from="base_highlight_vertical_line">
+            <area>1161,40,2,500</area>
+        </shape>
+
+        <shape name="terminal-arrows-backdrop" from="base_arrows_backdrop">
+            <area>1112,523,50,12</area>
+        </shape>
+
+        <shape name="terminal-bottom-backdrop" from="base_backdrop">
+            <area>115,534,1050,151</area>
+        </shape>
+
+        <shape name="terminal-bottom-backdrop-line" from="base_backdrop_line">
+            <area>116,535,1048,149</area>
+        </shape>
+
+        <shape name="terminal-bottom-top-line" from="base_highlight_line">
+            <area>117,536,1046,2</area>
+        </shape>
+
+        <shape name="terminal-bottom-bottom-line" from="base_highlight_line">
+            <area>117,681,1046,2</area>
+        </shape>
+
+        <shape name="terminal-bottom-left-line" from="base_highlight_vertical_line">
+            <area>117,538,2,143</area>
+        </shape>
+
+        <shape name="terminal-bottom-right-line" from="base_highlight_vertical_line">
+            <area>1161,538,2,143</area>
+        </shape>
+
+        <shape name="terminal-bottom-seperator-first-line" from="base_line">
+            <area>138,620,1004,2</area>
+        </shape>
+
+        <buttonlist name="output" from="base_list">
+            <area>123,44,1034,488</area>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,1034,30</area>
+                    <textarea name="buttontext">
+                        <area>8,0,1018,30</area>
+                        <font>basesmaller</font>
+                    </textarea>
+                </state>
+                <state name="selectedactive">
+                    <area>0,0,1034,64</area>
+                    <textarea name="buttontext">
+                        <area>8,0,1018,64</area>
+                        <align>vcenter</align>
+                        <multiline>yes</multiline>
+                    </textarea>
+                </state>
+                <state name="selectedinactive">
+                    <area>0,0,1034,64</area>
+                    <textarea name="buttontext">
+                        <area>8,0,1018,64</area>
+                        <align>vcenter</align>
+                        <multiline>yes</multiline>
+                    </textarea>
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>997,481</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>1017,481</position>
+            </statetype>
+        </buttonlist>
+        <textedit name="textedit" from="base_textedit">
+             <area>139,558,1003,42</area>
+        </textedit>
+        <button name="enter" from="base_button">
+            <area>540,631,200,40</area>
+            <value>Enter</value>
+        </button>
+    </window>
+</mythuitheme>
diff --git a/linhes/linhes-theme/status-ui.xml.patch b/linhes/linhes-theme/status-ui.xml.patch
new file mode 100644
index 0000000..f50061e
--- /dev/null
+++ b/linhes/linhes-theme/status-ui.xml.patch
@@ -0,0 +1,201 @@
+--- status-ui.xml.orig	2018-06-01 18:03:53.259163788 +0000
++++ status-ui.xml	2018-06-01 18:02:26.000483611 +0000
+@@ -170,100 +170,152 @@
+     </window>
+ 
+     <window name="standbymode">
+-        <area>-1,-1,568,320</area>
++        <area>0,0,1280,720</area>
+ 
+         <animation trigger="AboutToShow">
+-            <section>
+-                <alpha start="0" end="255" easingcurve="OutQuart"/>
+-                <zoom start="0" end="100" easingcurve="OutQuart"/>
++            <section duration="400">
++                <alpha start="0" end="255" easingcurve="InQuart"/>
+             </section>
+         </animation>
+ 
+         <animation trigger="AboutToHide">
+             <section>
+-                <alpha start="255" end="0" easingcurve="InQuart"/>
+-                <zoom start="100" end="0" easingcurve="InQuart"/>
++                <alpha start="255" end="0" easingcurve="OutQuart"/>
+             </section>
+         </animation>
+ 
++        <textarea name="heading" from="base_heading">
++            <value>Standby</value>
++        </textarea>
++
+         <shape name="standbymode-backdrop" from="base_backdrop">
+-            <area>0,0,568,320</area>
++            <area>20,36,1240,649</area>
+         </shape>
+ 
+         <shape name="standbymode-backdrop-line" from="base_backdrop_line">
+-            <area>1,1,566,318</area>
++            <area>21,37,1238,647</area>
+         </shape>
+ 
+         <shape name="standbymode-top-line" from="base_highlight_line">
+-            <area>2,2,564,2</area>
++            <area>22,38,1236,2</area>
+         </shape>
+ 
+         <shape name="standbymode-bottom-line" from="base_highlight_line">
+-            <area>2,316,564,2</area>
++            <area>22,681,1236,2</area>
+         </shape>
+ 
+         <shape name="standbymode-left-line" from="base_highlight_vertical_line">
+-            <area>2,4,2,312</area>
++            <area>22,40,2,641</area>
+         </shape>
+ 
+         <shape name="standbymode-right-line" from="base_highlight_vertical_line">
+-            <area>564,4,2,312</area>
++            <area>1256,40,2,641</area>
+         </shape>
+ 
+-        <textarea name="title">
+-            <area>4,4,552,64</area>
+-            <font>basemedium</font>
+-            <align>allcenter</align>
+-            <value>MythTV is in standby mode!</value>
+-        </textarea>
++        <shape name="standbymode-status-seperator-line" from="base_line">
++            <area>43,100,1194,2</area>
++        </shape>
++
++        <shape name="standbymode-recording-status-seperator-line" from="base_line">
++            <area>43,318,1194,2</area>
++        </shape>
++
++        <shape name="standbymode-scheduled-recording-status-seperator-line" from="base_line">
++            <area>43,536,1194,2</area>
++        </shape>
+ 
+         <statetype name="backendstatus">
+-            <area>4,4,560,312</area>
++            <area>40,40,1200,60</area>
+             <state name="idle">
+-                <area>0,0,560,312</area>
+-                <shape name="icon">
+-                    <area>74,64,412,184</area>
+-                    <type>roundbox</type>
+-                    <fill color="#80d400" />
+-                    <cornerradius>5</cornerradius>
+-                </shape>
+-                <textarea name="status">
+-                    <area>4,248,552,64</area>
+-                    <font>basemediumgreen</font>
+-                    <value>Backend is idle!</value>
++                <area>0,0,1200,60</area>
++                <textarea name="status" from="basetextarea">
++                    <area>0,0,1200,60</area>
++                    <font>baseextralarge</font>
++                    <value>Backend is Idle</value>
+                     <align>allcenter</align>
+-                    <multiline>true</multiline>
+                 </textarea>
+             </state>
+             <state name="recording" from="idle">
+-                <shape name="icon">
+-                    <fill color="#d93636" />
+-                </shape>
+                 <textarea name="status">
+-                    <font>basemediumred</font>
+-                    <value>Backend is recording!</value>
++                    <value>Backend is Recording</value>
+                 </textarea>
+             </state>
+             <state name="shuttingdown" from="idle">
+-                <shape name="icon">
+-                    <fill color="#d9d900" />
+-                </shape>
+                 <textarea name="status">
+-                    <font>basemediumyellow</font>
+-                    <value>Shutting Down!</value>
++                    <value>MythTV is Shutting Down</value>
+                 </textarea>
+             </state>
+             <state name="offline" from="idle">
+-                <shape name="icon">
+-                    <fill color="#d93636" />
+-                </shape>
+                 <textarea name="status">
+-                    <font>basemediumred</font>
+-                    <value>Backend is offline!</value>
++                    <value>Backend is Offline</value>
+                 </textarea>
+             </state>
+         </statetype>
+ 
++        <textarea name="currentrecordingheading" from="basetextarea">
++            <area>40,110,1200,30</area>
++            <font>basemediumlargerdarkyellow</font>
++            <align>allcenter</align>
++            <value>Currently Recording</value>
++        </textarea>
++        <textarea name="nothingrecording" depends="!currentrecording">
++            <area>40,144,1200,170</area>
++            <font>basesmall</font>
++            <align>hcenter,top</align>
++            <value>Nothing is Recording</value>
++        </textarea>
++        <buttonlist name="currentrecording">
++            <area>40,144,1200,170</area>
++            <layout>vertical</layout>
++            <spacing>4</spacing>
++            <scrollstyle>free</scrollstyle>
++            <arrange>stack</arrange>
++            <wrapstyle>items</wrapstyle>
++            <buttonarea>0,0,100%,100%</buttonarea>
++            <statetype name="buttonitem">
++                <state name="active">
++                    <textarea name="shorttimedate" from="basetextarea">
++                        <area>0,1,400,24</area>
++                        <align>right,vcenter</align>
++                    </textarea>
++                    <textarea name="channame" from="shorttimedate">
++                        <area>405,1,180,24</area>
++                        <align>allcenter</align>
++                    </textarea>
++                    <textarea name="titlesubtitle" from="shorttimedate">
++                        <area>590,1,610,24</area>
++                        <align>left,vcenter</align>
++                    </textarea>
++                </state>
++                <state name="selectedactive" from="active"/>
++                <state name="selectedinactive" from="selectedactive" />
++            </statetype>
++        </buttonlist>
++
++        <textarea name="nextrecordingheading" from="currentrecordingheading">
++            <area>40,328,1200,30</area>
++            <value>Upcoming Recordings</value>
++        </textarea>
++        <textarea name="nothingscheduled" depends="!nextrecording" from="nothingrecording">
++            <area>40,362,1200,170</area>
++            <value>No Recordings Are Scheduled</value>
++        </textarea>
++        <buttonlist name="nextrecording" from="currentrecording">
++            <area>40,362,1200,170</area>
++        </buttonlist>
++
++        <textarea name="conflictsheading" from="nextrecordingheading">
++            <area>40,546,1200,30</area>
++            <value>Recording Conflicts</value>
++        </textarea>
++        <textarea name="nothingconflicted" depends="!conflicts" from="nothingrecording">
++            <area>40,580,1200,91</area>
++            <value>No Conflicts</value>
++        </textarea>
++        <buttonlist name="conflicts" from="currentrecording">
++            <area>40,580,1200,91</area>
++        </buttonlist>
++
+     </window>
+ 
+ </mythuitheme>
diff --git a/linhes/linhes-theme/stream-ui.xml.patch b/linhes/linhes-theme/stream-ui.xml.patch
new file mode 100644
index 0000000..e555b2b
--- /dev/null
+++ b/linhes/linhes-theme/stream-ui.xml.patch
@@ -0,0 +1,568 @@
+--- stream-ui.xml.orig	2016-12-13 20:49:12.313146317 +0000
++++ stream-ui.xml	2016-12-13 20:34:54.363217804 +0000
+@@ -41,7 +41,7 @@
+             <area>28,40,1224,276</area>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+-            <value>Press MENU to add some radio streams to play.</value>
++            <value>Press MENU to add radio streams to play</value>
+         </textarea>
+ 
+         <buttonlist name="streamlist" from="base_list">
+@@ -90,21 +90,24 @@
+                             </textarea>
+                         </state>
+                     </statetype>
+-                    <textarea name="station" from="buttontext">
++                    <textarea name="broadcaster" from="buttontext">
+                         <area>153,0,200,30</area>
+                         <align>left,vcenter</align>
++                        <font>basesmall</font>
+                     </textarea>
+-                    <textarea name="channel" from="buttontext">
+-                        <area>363,0,370,30</area>
+-                        <align>left,vcenter</align>
++                    <textarea name="channel" from="broadcaster">
++                        <area>363,0,470,30</area>
+                     </textarea>
+-                    <textarea name="genre" from="buttontext">
+-                        <area>743,0,462,30</area>
++                    <textarea name="genre" from="broadcaster">
++                        <area>843,0,362,30</area>
+                         <align>right,vcenter</align>
+                     </textarea>
+                 </state>
+                 <state name="selectedactive">
+                     <area>0,0,100%,64</area>
++                        <group name="select_bar" from="base_select_bar_selectedactive_group">
++                            <area>0,0,100%,100%</area>
++                        </group>
+                     <imagetype name="buttonimage">
+                         <area>15,3,58,58</area>
+                         <filename>mm_icecast.png</filename>
+@@ -144,23 +147,43 @@
+                             </textarea>
+                         </state>
+                     </statetype>
+-                    <textarea name="station" from="buttontext">
+-                        <area>183,0,200,64</area>
++                    <textarea name="broadcaster" from="buttontext">
++                        <area>183,1,200,30</area>
+                         <align>left,vcenter</align>
+                     </textarea>
+-                    <textarea name="channel" from="buttontext">
+-                        <area>393,0,356,64</area>
+-                        <align>left,vcenter</align>
++                    <textarea name="channel" from="broadcaster">
++                        <area>393,1,456,30</area>
+                     </textarea>
+-                    <textarea name="genre" from="buttontext">
+-                        <area>759,0,450,64</area>
++                    <textarea name="genre" from="broadcaster">
++                        <area>859,1,350,30</area>
+                         <align>right,vcenter</align>
+                     </textarea>
++                    <textarea name="description" from="broadcaster">
++                        <area>203,32,1006,30</area>
++                        <font>basesmallerblue</font>
++                        <multiline>no</multiline>
++                        <scroll direction="left" startdelay="1"/>
++                    </textarea>
+                 </state>
+                 <state name="selectedinactive" from="selectedactive">
+                     <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                         <area>0,0,100%,100%</area>
+                     </group>
++                    <textarea name="broadcaster">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="channel">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="genre">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="description" from="broadcaster">
++                        <area>203,32,1006,30</area>
++                        <font>basesmallerblue</font>
++                        <multiline>no</multiline>
++                        <cutdown>yes</cutdown>
++                    </textarea>
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+@@ -263,6 +286,18 @@
+                         <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                             <area>0,0,100%,100%</area>
+                         </group>
++                        <textarea name="tracknum">
++                            <font>basesmall</font>
++                        </textarea>
++                        <textarea name="title">
++                            <font>basesmall</font>
++                        </textarea>
++                        <textarea name="artist">
++                            <font>basesmall</font>
++                        </textarea>
++                        <textarea name="length">
++                            <font>basesmall</font>
++                        </textarea>
+                     </state>
+                 </statetype>
+                 <statetype name="upscrollarrow">
+@@ -332,12 +367,12 @@
+ 
+             <textarea name="channel" from="basetextarea">
+                 <area>187,86,906,33</area>
+-                <font>basesmallblue</font>
+-                <template>%STATION% - %CHANNEL%</template>
++                <font>basesmall</font>
++                <template>%BROADCASTER% - %CHANNEL%</template>
+             </textarea>
+ 
+             <textarea name="filename" from="basetextarea">
+-                <font>basesmall</font>
++                <font>basesmallblue</font>
+                 <area>187,119,906,33</area>
+             </textarea>
+ 
+@@ -359,22 +394,6 @@
+                 <align>allcenter</align>
+             </textarea>
+ 
+-            <button name="prev" from="base_prev_button">
+-                <position>584,158</position>
+-            </button>
+-
+-            <button name="play" from="base_play_button">
+-                <position>618,158</position>
+-            </button>
+-
+-            <button name="stop" from="base_stop_button">
+-                <position>646,158</position>
+-            </button>
+-
+-            <button name="next" from="base_next_button">
+-                <position>676,158</position>
+-            </button>
+-
+             <statetype name="mutestate" from="base_mute_state">
+                 <position>57,163</position>
+             </statetype>
+@@ -384,11 +403,11 @@
+             </textarea>
+ 
+             <progressbar name="bufferprogress" from="baseprogressbar">
+-                <position>372,180</position>
++                <position>372,170</position>
+             </progressbar>
+ 
+             <textarea name="bufferstatus" from="basetextarea">
+-                <area>918,179,175,14</area>
++                <area>918,167,175,14</area>
+                 <font>basesupersmallyellow</font>
+             </textarea>
+ 
+@@ -408,6 +427,7 @@
+ 
+         <shape name="edit-stream-metadata-backdrop-line" from="base_backdrop_line">
+             <area>116,37,1048,506</area>
++            <area>116,37,1048,566</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-top-line" from="base_highlight_line">
+@@ -415,23 +435,25 @@
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-line" from="base_highlight_line">
+-            <area>117,540,1046,2</area>
++            <area>117,600,1046,2</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-left-line" from="base_highlight_vertical_line">
+-            <area>117,40,2,500</area>
++            <area>117,40,2,560</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-right-line" from="base_highlight_vertical_line">
+-            <area>1161,40,2,500</area>
++            <area>1161,40,2,560</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-backdrop-line" from="base_backdrop_line">
+             <area>116,547,1048,137</area>
++            <area>116,619,1048,65</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-top-line" from="base_highlight_line">
+             <area>117,548,1046,2</area>
++            <area>117,620,1046,2</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-bottom-line" from="base_highlight_line">
+@@ -439,85 +461,137 @@
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-left-line" from="base_highlight_vertical_line">
+-            <area>117,550,2,131</area>
++            <area>117,622,2,59</area>
+         </shape>
+ 
+         <shape name="edit-stream-metadata-bottom-right-line" from="base_highlight_vertical_line">
+-            <area>1161,550,2,131</area>
+-        </shape>
+-
+-        <shape name="edit-stream-metadata-bottom-seperator-first-line" from="base_line">
+-            <area>138,620,1004,2</area>
++            <area>1161,622,2,59</area>
+         </shape>
+ 
+-        <textarea name="stationlabel" >
+-            <area>119,68,214,40</area>
++        <textarea name="broadcasterlabel" >
++            <area>119,54,140,40</area>
+             <font>basemedium</font>
+             <align>right,vcenter</align>
+-            <value>Station:</value>
++            <value>Broadcaster:</value>
+         </textarea>
+ 
+-        <textedit name="stationedit" from="base_textedit">
+-            <area>343,68,800,40</area>
++        <textedit name="broadcasteredit" from="base_textedit">
++            <area>269,54,370,40</area>
+         </textedit>
+ 
+-        <button name="searchbutton" from="base_button">
+-            <area>465,136,350,40</area>
+-            <value>Search for Stream</value>
+-        </button>
+-
+-        <textarea name="channellabel" from="stationlabel">
+-            <position>119,204</position>
++        <textarea name="channellabel" from="broadcasterlabel">
++            <area>649,54,120,40</area>
+             <value>Channel:</value>
+         </textarea>
+ 
+-        <textedit name="channeledit" from="stationedit">
+-            <position>343,204</position>
++        <textedit name="channeledit" from="broadcasteredit">
++            <position>779,54</position>
++        </textedit>
++
++        <textarea name="descriptionlabel" from="broadcasterlabel">
++            <area>119,109,140,40</area>
++            <value>Description:</value>
++        </textarea>
++
++        <textedit name="descriptionedit" from="broadcasteredit">
++            <area>269,109,880,40</area>
+         </textedit>
+ 
+-        <textarea name="urllabel" from="stationlabel">
+-            <position>119,271</position>
+-            <value>URL:</value>
++        <textarea name="url1label" from="descriptionlabel">
++            <position>119,164</position>
++            <value>URL1:</value>
+         </textarea>
++        <textedit name="url1edit" from="descriptionedit">
++            <position>269,164</position>
++        </textedit>
++
++        <textarea name="url2label" from="descriptionlabel">
++            <position>119,219</position>
++            <value>URL2:</value>
++        </textarea>
++        <textedit name="url2edit" from="descriptionedit">
++            <position>269,219</position>
++        </textedit>
++
++        <textarea name="url3label" from="descriptionlabel">
++            <position>119,274</position>
++            <value>URL3:</value>
++        </textarea>
++        <textedit name="url3edit" from="descriptionedit">
++            <position>269,274</position>
++        </textedit>
++
++        <textarea name="url4label" from="descriptionlabel">
++            <position>119,329</position>
++            <value>URL4:</value>
++        </textarea>
++        <textedit name="url4edit" from="descriptionedit">
++            <position>269,329</position>
++        </textedit>
+ 
+-        <textedit name="urledit" from="stationedit">
+-            <position>343,271</position>
++        <textarea name="url5label" from="descriptionlabel">
++            <position>119,384</position>
++            <value>URL5:</value>
++        </textarea>
++        <textedit name="url5edit" from="descriptionedit">
++            <position>269,384</position>
+         </textedit>
+ 
+-        <textarea name="logourllabel" from="stationlabel">
+-            <position>119,338</position>
++        <textarea name="logourllabel" from="descriptionlabel">
++            <position>119,439</position>
+             <value>Logo URL:</value>
+         </textarea>
+ 
+-        <textedit name="logourledit" from="urledit">
+-            <position>343,338</position>
++        <textedit name="logourledit" from="descriptionedit">
++            <position>269,439</position>
+         </textedit>
+ 
+-        <textarea name="genrelabel" from="stationlabel">
+-            <position>119,405</position>
++        <textarea name="genrelabel" from="broadcasterlabel">
++            <position>119,494</position>
+             <value>Genres:</value>
+         </textarea>
+ 
+-        <textedit name="genreedit" from="urledit">
+-            <position>343,405</position>
++        <textedit name="genreedit" from="broadcasteredit">
++            <position>269,494</position>
+         </textedit>
+ 
+-        <textarea name="formatlabel" from="stationlabel">
+-            <position>119,472</position>
+-            <value>Metadata Format:</value>
++        <textarea name="formatlabel" from="channellabel">
++            <position>649,494</position>
++            <value>Format:</value>
+         </textarea>
+ 
+-        <textedit name="formatedit" from="stationedit">
+-            <position>343,472</position>
++        <textedit name="formatedit" from="channeledit">
++            <position>779,494</position>
++        </textedit>
++
++        <textarea name="countrylabel" from="broadcasterlabel">
++            <position>119,549</position>
++            <value>Country:</value>
++        </textarea>
++        <textedit name="countryedit" from="broadcasteredit">
++            <position>269,549</position>
++        </textedit>
++
++        <textarea name="languagelabel" from="channellabel">
++            <position>649,549</position>
++            <value>Language:</value>
++        </textarea>
++        <textedit name="languageedit" from="channeledit">
++            <position>779,549</position>
+         </textedit>
+ 
+         <button name="cancelbutton" from="base_button">
+-            <area>233,632,350,40</area>
++            <area>138,632,320,40</area>
+             <value>Cancel</value>
+         </button>
+ 
++        <button name="searchbutton" from="base_button">
++            <area>480,632,320,40</area>
++            <value>Search for Stream...</value>
++        </button>
++
+         <button name="savebutton" from="base_button">
+-            <area>697,632,350,40</area>
++            <area>822,632,320,40</area>
+             <value>Save</value>
+         </button>
+ 
+@@ -553,14 +627,6 @@
+             <area>1256,40,2,211</area>
+         </shape>
+ 
+-        <shape name="stream-search-image-border">
+-            <area>37,53,247,185</area>
+-            <type>roundbox</type>
+-            <fill color="#000000" alpha="0" />
+-            <line color="#AAAAAA" alpha="100" width="2" />
+-            <cornerradius>6</cornerradius>
+-        </shape>
+-
+         <shape name="stream-list-backdrop" from="base_backdrop">
+             <area>20,265,1240,420</area>
+         </shape>
+@@ -589,50 +655,65 @@
+             <area>1207,685,50,10</area>
+         </shape>
+ 
+-        <imagetype name="stream-search-image">
+-            <area>41,57,239,177</area>
+-            <filename>images/stream_search_image.png</filename>
+-            <mask>images/masks/stream_search_image_mask.png</mask>
+-            <preserveaspect>no</preserveaspect>
+-        </imagetype>
+-
+-        <textarea name="stationlabel" >
+-            <area>214,64,250,40</area>
++        <textarea name="broadcasterlabel" >
++            <area>71,64,150,40</area>
+             <font>basemedium</font>
+             <align>right,vcenter</align>
+-            <value>Station:</value>
++            <value>Broadcaster:</value>
+         </textarea>
+ 
+-        <buttonlist name="stationlist" from="base_selector">
+-            <area>470,64,376,40</area>
++        <buttonlist name="broadcasterlist" from="base_selector">
++            <area>231,64,370,40</area>
+         </buttonlist>
+ 
+-        <textarea name="genrelabel" from="stationlabel">
+-            <position>214,125</position>
++        <textarea name="genrelabel" from="broadcasterlabel">
++            <area>611,64,150,40</area>
+             <value>Genre:</value>
+         </textarea>
+ 
+-        <buttonlist name="genrelist" from="stationlist">
+-            <position>470,125</position>
++        <buttonlist name="genrelist" from="broadcasterlist">
++            <position>771,64</position>
++        </buttonlist>
++
++        <textarea name="countrylabel" from="broadcasterlabel">
++            <position>71,125</position>
++            <value>Country:</value>
++        </textarea>
++
++        <buttonlist name="countrylist" from="broadcasterlist">
++            <position>231,125</position>
++        </buttonlist>
++
++        <textarea name="languagelabel" from="genrelabel">
++            <position>611,125</position>
++            <value>Language:</value>
++        </textarea>
++
++        <buttonlist name="languagelist" from="genrelist">
++            <position>771,125</position>
+         </buttonlist>
+ 
+-        <textarea name="channellabel" from="stationlabel">
+-            <position>214,186</position>
++        <textarea name="channellabel" from="broadcasterlabel">
++            <position>71,186</position>
+             <value>Channel:</value>
+         </textarea>
+ 
+         <textedit name="channeledit" from="base_textedit">
+-            <area>470,186,376,40</area>
++            <area>231,186,370,40</area>
+             <textarea name="text">
+                 <area>18,0,95%,100%</area>
+             </textarea>
+         </textedit>
+ 
++        <textarea name="matcheslabel" from="genrelabel" depends="matchestext">
++            <position>611,186</position>
++            <value>Matches:</value>
++        </textarea>
++
+         <textarea name="matchestext">
+-            <area>871,40,375,211</area>
+-            <font>basemediumblue</font>
+-            <align>allcenter</align>
+-            <template>Matches: %1</template>
++            <area>771,186,370,40</area>
++            <font>basemedium</font>
++            <align>left,vcenter</align>
+         </textarea>
+ 
+         <buttonlist name="streamlist" from="base_list">
+@@ -650,16 +731,16 @@
+                         <area>15,1,28,28</area>
+                         <filename>mythmusic/mm_icecast.png</filename>
+                     </imagetype>
+-                    <textarea name="station" from="buttontext">
++                    <textarea name="broadcasterchannel" from="buttontext">
+                         <area>58,0,548,30</area>
+                         <font>basesmall</font>
+                         <align>left,vcenter</align>
+-                        <template>%STATION% - %Channel%</template>
+                     </textarea>
+-                    <textarea name="genre" from="buttontext">
+-                        <area>621,0,548,30</area>
+-                        <font>basesmall</font>
+-                        <align>left,vcenter</align>
++                    <textarea name="genre" from="broadcasterchannel">
++                        <area>621,0,355,30</area>
++                    </textarea>
++                    <textarea name="language" from="broadcasterchannel">
++                        <area>990,0,177,30</area>
+                     </textarea>
+                     <statetype name="selectedstate">
+                         <position>1184,2</position>
+@@ -681,18 +762,21 @@
+                         <area>15,4,56,56</area>
+                         <filename>mythmusic/mm_icecast.png</filename>
+                     </imagetype>
+-                    <textarea name="station" from="buttontext">
+-                        <area>86,0,534,64</area>
+-                        <font>basesmall</font>
+-                        <multiline>yes</multiline>
++                    <textarea name="broadcasterchannel" from="buttontext">
++                        <area>86,0,534,30</area>
++                        <font>basesmallyellow</font>
++                        <multiline>no</multiline>
+                         <align>left,vcenter</align>
+-                        <template>%STATION% - %Channel%</template>
+                     </textarea>
+-                    <textarea name="genre" from="buttontext">
+-                        <area>635,0,534,64</area>
+-                        <font>basesmall</font>
+-                        <multiline>yes</multiline>
+-                        <align>left,vcenter</align>
++                    <textarea name="genre" from="broadcasterchannel">
++                        <area>635,0,534,30</area>
++                    </textarea>
++                    <textarea name="language" from="broadcasterchannel">
++                        <area>1004,0,177,30</area>
++                    </textarea>
++                    <textarea name="description" from="broadcasterchannel">
++                        <area>86,30,100%,30</area>
++                        <scroll direction="left" startdelay="2"/>
+                     </textarea>
+                     <statetype name="selectedstate">
+                         <position>1184,19</position>
+@@ -708,6 +792,20 @@
+                     <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                         <area>0,0,100%,100%</area>
+                     </group>
++                    <textarea name="broadcasterchannel">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="genre">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="language">
++                        <font>basesmall</font>
++                    </textarea>
++                    <textarea name="description" from="broadcasterchannel">
++                        <area>86,30,100%,30</area>
++                        <font>basesmall</font>
++                        <cutdown>yes</cutdown>
++                    </textarea>
+                 </state>
+             </statetype>
+             <statetype name="upscrollarrow">
+@@ -718,7 +816,6 @@
+             </statetype>
+         </buttonlist>
+ 
+-
+     </window>
+ 
+ </mythuitheme>
diff --git a/linhes/linhes-theme/themeinfo.xml b/linhes/linhes-theme/themeinfo.xml
new file mode 100644
index 0000000..dbd0e16
--- /dev/null
+++ b/linhes/linhes-theme/themeinfo.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.xsd">
+<themeinfo>
+    <!-- The Theme Name (Required) -->
+    <name>LinHES</name>
+
+    <!-- The Theme Types (Required) -->
+    <types>
+        <!-- Type. Legal Values are one or more of: UI, OSD and Menu -->
+        <type>UI</type>
+        <type>OSD</type>
+    </types>
+
+    <!-- Aspect ratio of the theme. (Required)
+         Maybe be: 4:3, 5:4, 16:9 or 16:10 -->
+    <aspect>16:9</aspect>
+
+    <!-- The base resolution of the theme before being scaled to the users
+         resolution (Required)
+         Usually 800x600 (4:3) or 1280x720 (16:9) -->
+    <baseres>1280x720</baseres>
+
+    <!-- Theme Author Details (Optional)-->
+    <author>
+        <!-- Your name -->
+        <name>LinHES Dev</name>
+
+        <!-- Your Email Address -->
+        <email>http://linhes.org</email>
+    </author>
+
+    <!-- The Versioning Info (Required) -->
+    <version>
+        <!-- Major version changes mean the theme is no longer
+             compatible with earlier versions of mythtv -->
+        <major>MAJ_VER</major>
+
+        <!-- Minor version changes are backwards compatible -->
+        <minor>MIN_VER</minor>
+    </version>
+
+    <!-- Theme Details (Required) -->
+    <detail>
+        <!-- At least one thumbnail image named "preview" must be included
+             with the theme.
+             There is no limit to the number of thumbnails.
+             Each thumbnail must be given a different name -->
+        <thumbnail name="preview">preview.png</thumbnail>
+
+        <!-- A description of the theme, including general colours and
+             style. The description should include any details that
+             may help to locate your theme in a search. -->
+        <description>LinHES is a transparent theme based on TintedGlass.</description>
+
+        <!-- Errata. A list of known faults, missing elements or unfinished
+             areas. e.g. "mythgallery not themed" -->
+        <errata>LinHES is based on TintedGlass. This version of TintedGlass is released under the GPLv2.</errata>
+    </detail>
+</themeinfo>
diff --git a/linhes/linhes-theme/tux_thoughts.png b/linhes/linhes-theme/tux_thoughts.png
new file mode 100644
index 0000000..c36c7a6
Binary files /dev/null and b/linhes/linhes-theme/tux_thoughts.png differ
diff --git a/linhes/linhes-theme/video-ui.xml.patch b/linhes/linhes-theme/video-ui.xml.patch
new file mode 100644
index 0000000..ef00618
--- /dev/null
+++ b/linhes/linhes-theme/video-ui.xml.patch
@@ -0,0 +1,1654 @@
+--- 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>
diff --git a/linhes/linhes-theme/warning.png b/linhes/linhes-theme/warning.png
new file mode 100644
index 0000000..047cac5
Binary files /dev/null and b/linhes/linhes-theme/warning.png differ
diff --git a/linhes/linhes-theme/weather-ui.xml.patch b/linhes/linhes-theme/weather-ui.xml.patch
new file mode 100644
index 0000000..01c058a
--- /dev/null
+++ b/linhes/linhes-theme/weather-ui.xml.patch
@@ -0,0 +1,126 @@
+--- weather-ui.xml.orig	2017-10-26 17:16:29.549239075 +0000
++++ weather-ui.xml	2017-10-26 17:04:02.976373390 +0000
+@@ -111,7 +111,7 @@
+ 
+         <textarea name="cclocation" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -217,7 +217,7 @@
+ 
+         <textarea name="3dlocation" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -385,7 +385,7 @@
+ 
+         <textarea name="6dlocation" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -662,7 +662,7 @@
+ 
+         <textarea name="smdesc" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -698,7 +698,7 @@
+ 
+         <textarea name="amdesc" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -746,7 +746,7 @@
+ 
+         <textarea name="swlocation" from="basetextarea">
+             <area>233,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -775,7 +775,7 @@
+ 
+         <textarea name="18hrlocation" from="basetextarea">
+             <area>232,90,816,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -1205,7 +1205,7 @@
+ 
+         <textarea name="inactivehdr" from="basetextarea">
+             <area>215,40,415,38</area>
+-            <font>basesmallyellow</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+@@ -1263,7 +1263,7 @@
+                         <area>8,0,383,64</area>
+                         <multiline>yes</multiline>
+                     </textarea>
+-                   <imagetype name="rightarrow" from="buttonarrow">
++                    <imagetype name="rightarrow" from="buttonarrow">
+                         <position>399,22</position>
+                     </imagetype>
+                 </state>
+@@ -1285,7 +1285,7 @@
+ 
+         <textarea name="helptxt" from="basetextarea">
+             <area>223,446,847,158</area>
+-            <font>basesomewhatsmallerblue</font>
++            <font>basesomewhatsmaller</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+         </textarea>
+@@ -1438,7 +1438,7 @@
+ 
+         <textarea name="srcinfo" from="basetextarea">
+             <area>164,470,952,130</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+         </textarea>
+@@ -1542,7 +1542,7 @@
+ 
+         <textarea name="helptxt" from="basetextarea">
+             <area>330,40,620,90</area>
+-            <font>basesmallerblue</font>
++            <font>basesmaller</font>
+             <value>Enter your current location, nearest large town or city. In some countries postal codes are also supported. Hit the right or down arrow to continue. </value>
+             <multiline>yes</multiline>
+             <align>allcenter</align>
+@@ -1594,13 +1594,13 @@
+ 
+         <textarea name="numresults" from="basetextarea">
+             <area>330,517,620,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
+         <textarea name="source" from="basetextarea">
+             <area>330,559,620,42</area>
+-            <font>basesmallblue</font>
++            <font>basesmall</font>
+             <align>allcenter</align>
+         </textarea>
+ 
-- 
cgit v0.12

