Merge branch 'testing'

8 files changed, 675 insertions, 57 deletions

diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index 2b1aba3..c8e97ab 100644
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,20 +1,37 @@
 pkgname=linhes-theme
-pkgver=8.1
-pkgrel=20
+pkgver=8.2
+pkgrel=7
 pkgdesc="Default LinHES MythTV theme"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://linhes.org/"
 
 patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch'
-         'menu-ui-vert.xml.patch' 'recordings-ui.xml.patch' 'qtlook.txt.patch')
+         'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch')
 
-#The LinHES theme is based on TintedGlass 4.39 by Harley Peters
-source=("git+https://github.com/MythTV-Themes/TintedGlass.git#branch=fixes/0.27"
-        `echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
+#The LinHES theme is based on TintedGlass 4.56 by Harley Peters
+source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml'
         'background.png' 'preview.png' 'tux_thoughts.png'
         'LHLogoAndText.png')
 
+prepare() {
+    _gitroot="https://github.com/MythTV-Themes/TintedGlass.git"
+    _gitname="TintedGlass"
+    _gitbranch="fixes/0.27"
+
+    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
 
@@ -53,15 +70,22 @@ package() {
     grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g"
     #blue
     grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g"
+
+    msg "Modifying fonts to Overlock"
+    grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g"
+
+    msg "Updating themeinfo.xml version number"
+    IFS="." read -a array <<< "$pkgver"
+    sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
+    sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
-md5sums=('SKIP'
-         '95478bd9bab15e9e4365c1048757c225'
-         'ed4f8baf431e20babc345e4e2602426f'
-         '9c2c8f2a8d881e01ea84457ae508f655'
-         'ec11d601d47cd4b2954e1609262a571b'
-         '4ad8bc893412eeeb890f0b1f1f1bd541'
+md5sums=('2dca856c2a4d1f959473512c94e43b60'
+         'e857e084963166bb37c6236463750dc1'
+         '5fccb4e20c15d87223ea5de4c40faa06'
+         'c75c83b90969fb07755062113f858e88'
+         '22ff4044c8c29560451fb51dcbf4d44e'
          '9fe3371a8b964a7028126405cfaa330b'
-         '7d7bc458a8f4af408700609f3e1f412e'
+         '5a8fb2a5f0e657d52be6f0a6a006ce72'
          'a0201e0aa1608eeab27ee754e4d2c1de'
          '12d26a786fde397348653128a6d7676a'
          '4b1c27297bb5f8d9d7bbaf72b35130b5'
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index bbf971d..a0715f6 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,209 @@
---- base.xml.orig	2014-01-02 20:11:41.055260777 +0000
-+++ base.xml	2014-01-02 20:20:50.598179696 +0000
+--- base.xml.orig	2014-10-26 18:47:37.279439028 +0000
++++ base.xml	2014-10-26 19:02:50.565913686 +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">
+@@ -241,55 +241,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 -->
+@@ -411,7 +411,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 +424,7 @@
  
      <!-- Base definition of a base popup backdrop -->
@@ -9,3 +213,96 @@
      </shape>
  
      <!-- Base definition of a heading group -->
+@@ -667,10 +667,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="#ebb81c" />
++                    <stop position="25" color="#ebb81c" alpha="255" />
++                    <stop position="50" color="#ebb81c" />
++                    <stop position="100" color="#ebb81c" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -679,10 +679,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="#ebb81c" />
++                    <stop position="50" color="#ebb81c" />
++                    <stop position="75" color="#ebb81c" alpha="255"/>
++                    <stop position="100" color="#ebb81c" />
+                 </gradient>
+             </fill>
+         </shape>
+@@ -863,7 +863,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 +956,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 +967,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 +1060,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 +1071,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 +1164,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 +1233,7 @@
+             <type>roundbox</type>
+             <fill color="#333333" alpha="175" />
+             <line color="#454545" alpha="180" width="2" />
+-            <cornerradius>90</cornerradius>
++            <cornerradius>5</cornerradius>
+         </shape>
+      </group>
+ 
diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch
index 4cfd697..914ecf7 100644
--- a/abs/core/linhes-theme/menu-ui-vert.xml.patch
+++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch
@@ -1,6 +1,6 @@
---- menu-ui-vert.xml.orig	2014-01-02 20:22:20.736627009 +0000
-+++ menu-ui-vert.xml	2014-01-03 20:45:31.091048579 +0000
-@@ -18,6 +18,24 @@
+--- menu-ui-vert.xml.orig	2014-03-26 17:04:48.808874995 +0000
++++ menu-ui-vert.xml	2014-03-26 17:06:18.504013928 +0000
+@@ -18,6 +18,49 @@
              <area>394,0,2,720</area>
          </shape>
  
@@ -22,10 +22,35 @@
 +            <filename>images/LHLogoAndText.png</filename> <!--851x277 3.072-->
 +        </imagetype>
 +
++        <!--LinHES UPDATE MESSAGE
++        <shape name="update_box" from="base_backdrop">
++            <area>519,593,638,64</area>
++        </shape>
++        <shape name="update_box_backdrop_line" from="base_backdrop_line">
++            <area>519,593,638,64</area>
++        </shape>
++        <shape name="update_box_backdrop_top_line" from="base_highlight_line">
++            <area>520,594,636,2</area>
++        </shape>
++        <shape name="update_box_backdrop_bottom_line" from="base_highlight_line">
++            <area>520,654,636,2</area>
++        </shape>
++        <shape name="update_box_backdrop_left_line" from="base_highlight_vertical_line">
++            <area>520,596,2,54</area>
++        </shape>
++        <shape name="update_box_backdrop_right_line" from="base_highlight_vertical_line">
++            <area>1154,596,2,54</area>
++        </shape>
++        <textarea name="update_text" from="description">
++            <area>529,593,628,64</area>
++            <value>Updates available in the Service Menu</value>
++        </textarea>
++        -->
++
          <statetype name="titles">
              <state name="MAIN">
                  <textarea name="heading">
-@@ -123,6 +141,41 @@
+@@ -123,6 +166,41 @@
                      <value>Archive Utilities</value>
                  </textarea>
              </state>
@@ -67,7 +92,7 @@
          </statetype>
  
          <buttonlist name="menu">
-@@ -162,21 +215,6 @@
+@@ -162,21 +240,6 @@
                          <cutdown>yes</cutdown>
                          <case>upper</case>
                      </textarea>
diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index 67748f7..6c29161 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,17 +1,296 @@
---- osd.xml.orig	2014-01-02 19:56:57.605092545 +0000
-+++ osd.xml	2014-01-02 20:02:34.958563960 +0000
-@@ -996,12 +996,12 @@
+--- osd.xml.orig	2014-10-26 18:47:55.853729172 +0000
++++ osd.xml	2014-10-26 19:11:25.023453880 +0000
+@@ -7,13 +7,13 @@
+     <window name="osd_debug">
+         <area>0,0,1280,720</area>
  
- <!-- Commit 6216029d2 makes this show up in both recordings and video. --> 
- <!-- Since I only want it in video and there is no way to control it. I have no choice but to disable it. -->
--<!--
-+
-         <imagetype name="coverart">
-             <area>70,492,158,186</area>
-             <alpha>255</alpha>
-         </imagetype>
---->
+-        <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">
+@@ -252,8 +252,8 @@
+     <window name="osd_message">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="medium" face="DejaVu Sans">
+-            <pixelsize>24</pixelsize>
++        <fontdef name="medium" face="Overlock">
++            <pixelsize>28</pixelsize>
+             <color>#e6e6e6</color>
+         </fontdef>
+ 
+@@ -315,9 +315,9 @@
+     <window name="osd_input">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="large" face="DejaVu Sans">
++        <fontdef name="large" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>32</pixelsize>
++            <pixelsize>34</pixelsize>
+         </fontdef>
+ 
+         <shape name="osd-input-backdrop">
+@@ -378,9 +378,9 @@
+     <window name="osd_status">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <shape name="osd-status-backdrop">
+@@ -470,39 +470,39 @@
+     <window name="program_info">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>21</pixelsize>
++            <pixelsize>23</pixelsize>
+         </fontdef>
+ 
+ 	<fontdef name="supersmall" from="small">
+             <weight>bold</weight>
+-            <pixelsize>12</pixelsize>
++            <pixelsize>14</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smaller" from="small">
+-            <pixelsize>16</pixelsize>
++            <pixelsize>18</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="mediumsmall" from="small">
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>22</pixelsize>
++            <pixelsize>24</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="title" from="small">
+-            <color>#d9d900</color>
+-            <pixelsize>26</pixelsize>
++            <color>#ebb81c</color>
++            <pixelsize>28</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="large" from="small">
+-            <pixelsize>28</pixelsize>
++            <pixelsize>30</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="supersmallblue" from="supersmall">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <shape name="program-info-backdrop">
+@@ -1015,25 +1015,30 @@
+     <window name="browse_info">
+         <area>0,0,1280,720</area>
+ 
+-        <fontdef name="small" face="DejaVu Sans">
++        <fontdef name="small" face="Overlock">
+             <color>#e6e6e6</color>
+-            <pixelsize>21</pixelsize>
++            <pixelsize>23</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="smaller" from="small">
+-            <pixelsize>18</pixelsize>
++            <pixelsize>20</pixelsize>
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>24</pixelsize>
++            <pixelsize>26</pixelsize>
++        </fontdef>
 +
- 	<textarea name="category">
-             <font>supersmallblue</font>
-             <area>257,490,937,28</area>
++        <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 +1089,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 +1097,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 +1109,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 +1156,30 @@
+         </textarea>
+ 
+         <textarea name="title">
+-            <font>medium</font>
++            <font>title</font>
+             <area>228,494,816,30</area>
+             <align>left,vcenter</align>
+         </textarea>
+ 
+         <textarea name="timedate">
+-            <font>smallerblue</font>
++            <font>smaller</font>
+             <area>228,529,497,22</area>
+             <align>vcenter</align>
+             <template>%TIMEDATE% : %LENMINS%</template>
+         </textarea>
+ 
+         <textarea name="longrepeat">
+-            <font>smallerblue</font>
+-            <area>740,530,304,20</area>
++            <font>smaller</font>
++            <area>902,530,310,20</area>
+             <align>right,vcenter</align>
+             <template>%LONGREPEAT%</template>
+         </textarea>
+ 
+         <clock name="clock">
+-            <area>1060,492,152,62</area>
+-            <font>large</font>
++            <area>1086,494,120,30</area>
++            <font>medium</font>
+             <template>%TIME%</template>
+-            <align>allcenter</align>
++            <align>right,vcenter</align>
+         </clock>
+ 
+         <textarea name="description">
+@@ -1214,9 +1195,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 +1205,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallblue" from="small">
+-            <color>#3a9ade</color>
++            <color>#0072bc</color>
+         </fontdef>
+ 
+         <fontdef name="smallgrey" from="small">
+@@ -1232,7 +1213,7 @@
+         </fontdef>
+ 
+         <fontdef name="medium" from="small">
+-            <pixelsize>24</pixelsize>
++            <pixelsize>26</pixelsize>
+         </fontdef>
+ 
+         <shape name="channel-editor-backdrop">
+@@ -1610,9 +1591,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">
+@@ -1749,9 +1730,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 +1740,7 @@
+         </fontdef>
+ 
+         <fontdef name="smallyellow" from="small">
+-            <color>#d9d900</color>
++            <color>#ebb81c</color>
+         </fontdef>
+ 
+         <shape name="mythpopupbox-backdrop">
diff --git a/abs/core/linhes-theme/readme.txt.patch b/abs/core/linhes-theme/readme.txt.patch
index 15ac146..f82817d 100644
--- a/abs/core/linhes-theme/readme.txt.patch
+++ b/abs/core/linhes-theme/readme.txt.patch
@@ -1,5 +1,5 @@
---- readme.txt.orig	2014-01-02 21:51:10.099789520 +0000
-+++ readme.txt	2014-01-02 21:52:11.045337937 +0000
+--- 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.
 -
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
deleted file mode 100644
index 0f97dbc..0000000
--- a/abs/core/linhes-theme/recordings-ui.xml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- recordings-ui.xml.orig	2014-01-02 22:23:26.659072294 +0000
-+++ recordings-ui.xml	2014-01-02 22:32:08.212500575 +0000
-@@ -579,13 +579,13 @@
-                         <align>allcenter</align>
-                     </textarea>
-                     <textarea name="s00e00" from="base_text_font_state_extrasmall">
--                        <area>510,42,60,20</area>
-+                        <area>500,42,70,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>510,42,60,20</area>
-+                        <area>500,42,70,20</area>
-                         <font state="normal">baseextrasmall</font>
-                         <cutdown>no</cutdown>
-                         <align>allcenter</align>
diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch
new file mode 100644
index 0000000..930c26f
--- /dev/null
+++ b/abs/core/linhes-theme/schedule-ui.xml.patch
@@ -0,0 +1,11 @@
+--- schedule-ui.xml.orig	2014-10-26 18:47:27.740659484 +0000
++++ schedule-ui.xml	2014-10-26 18:45:31.642195458 +0000
+@@ -126,7 +126,7 @@
+             <conflictingcolor>#ff6600</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>
diff --git a/abs/core/linhes-theme/themeinfo.xml b/abs/core/linhes-theme/themeinfo.xml
index 3deae2c..dbd0e16 100644
--- a/abs/core/linhes-theme/themeinfo.xml
+++ b/abs/core/linhes-theme/themeinfo.xml
@@ -33,10 +33,10 @@
     <version>
         <!-- Major version changes mean the theme is no longer
              compatible with earlier versions of mythtv -->
-        <major>8</major>
+        <major>MAJ_VER</major>
 
         <!-- Minor version changes are backwards compatible -->
-        <minor>1</minor>
+        <minor>MIN_VER</minor>
     </version>
 
     <!-- Theme Details (Required) -->