Merge branch 'testing'HEADmaster

52 files changed, 702 insertions, 403 deletions

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 203aeb3..d4af965 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R8.6.0 (Feeding the Kids)
+LinHES R8.6.1 (Feeding the Kids)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 28fa7e3..fae3b9b 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
-pkgver=8.6.0
-pkgrel=2
+pkgver=8.6.1
+pkgrel=1
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -156,11 +156,11 @@ md5sums=('49952a2375b8ee53d8673473f22f8d12'
          '27e4fcacca9b9662dd782fbdc92fceea'
          '2a7f3b34e522acfd08283b86c8926aba'
          'da60447a2a5fe0e6f5aaed2e677281ef'
-         '29558e4560a305239ae126880b3af810'
+         'cf5164ae463a585897c7a1bfa1dc19d2'
          'f0376c98a7986897406d393186c0365e'
          '157e73d0f90d7b306aba8f5921aeedd3'
          '1f58c0393a131f4a8f9a84b3fe08a7e4'
-         '4dd17c4e1ad6047872fab3a37e9997ed'
+         'b38d98bed2d0532a3a2c96d04681941e'
          '5f890ea9bda6aef652d2560ca19dac07'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
          'd429b59d3cfb37b0624c6a4a71a7c2c0'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index f730f95..3bd7d25 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -16,15 +16,15 @@ echo -e "\n\n-------------------------------------------------------------------
 echo -e `date`"\n" >> $LOGFILE 2>&1
 
 #libxnvctrl is needed as a dep of mythtv so must be installed for every driver
-ATI_PKGS="xf86-video-ati libglvnd libxnvctrl"
-INTEL_PKGS="xf86-video-intel libglvnd libxnvctrl"
+ATI_PKGS="xf86-video-ati libva-mesa-driver libva-utils libglvnd libxnvctrl"
+INTEL_PKGS="xf86-video-intel libva-intel-driver libva-utils libglvnd libxnvctrl"
 NVIDIA_PKGS="nvidia nvidia-utils opencl-nvidia nvidia-settings libglvnd libxnvctrl"
 NVIDIA_390xx_PKGS="nvidia-390xx nvidia-390xx-utils opencl-nvidia-390xx nvidia-390xx-settings libglvnd libxnvctrl-390xx"
 NVIDIA_340xx_PKGS="nvidia-340xx nvidia-340xx-utils opencl-nvidia-340xx nvidia-340xx-settings libglvnd libxnvctrl-340xx"
 NVIDIA_304xx_PKGS="nvidia-304xx nvidia-304xx-utils opencl-nvidia-304xx libglvnd libxnvctrl-340xx"
 NVIDIA_ALL_PKGS=`echo $NVIDIA_PKGS $NVIDIA_390xx_PKGS $NVIDIA_340xx_PKGS $NVIDIA_304xx_PKGS|xargs -n1|sort -u`
 VESA_PKGS="xf86-video-vesa libglvnd libxnvctrl"
-VMWARE_PKGS="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa svga-dri libglvnd libxnvctrl"
+VMWARE_PKGS="xf86-input-vmmouse xf86-video-vmware xf86-video-vesa libglvnd libxnvctrl"
 
 for i in ati intel mga savage sis unichrome vmware
 do
@@ -38,7 +38,7 @@ MYTH_RUN_STATUS="1"
 
 NVIDIA_304xx_SUPPORTED="$TEMPLATES/xorg/304xx_supported.txt"
 NVIDIA_340xx_SUPPORTED="$TEMPLATES/xorg/340xx_supported.txt"
-NVIDIA_390xx_SUPPORTED="$TEMPLATES/xorg/340xx_supported.txt"
+NVIDIA_390xx_SUPPORTED="$TEMPLATES/xorg/390xx_supported.txt"
 NVIDIA_SUPPORTED="$TEMPLATES/xorg/nvidia_supported.txt"
 NVIDIA_DISABLE_MSI="$TEMPLATES/xorg/nvidia_disable_msi.txt"
 NVIDIA_MSI_MODPROBE="$BASE/etc/modprobe.d/nvidia_msi.conf"
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 7960bf5..bf71980 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -411,6 +411,7 @@ fi
 # this is done so that starting mythtv can loop.
 $WM &
 pid=$!
+/usr/LH/bin/enableIRWake.sh &
 mouse_move
 keylaunch
 unclutter
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index a236769..f0dfa3c 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=LinHES-system
-pkgver=8.6.0
+pkgver=8.6.1
 pkgrel=1
 arch=('x86_64')
 install=system.install
@@ -17,7 +17,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
  mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
  install_supplemental_service.sh get_airplay_key importfiles.sh
  lh_system_backup lh_system_backup_job lh_system_restore lh_system_restore_job
- lh_system_host_update lh_system_all_host_update
+ lh_system_host_update lh_system_all_host_update enableIRWake.sh
  add_storage.py balance_storage_groups.py empty_storage_groups.py
  remove_storage.py diskspace.sh cacheclean lh_backend_control.sh
  create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.py
@@ -80,7 +80,7 @@ package() {
 
 }
 
-md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
+md5sums=('9e941d6c6d4edd56f1a89a7ab566763c'
          'ad5e144999b6f37931dea799c2761c7e'
          'de32a1c50101265dd7f6ca5037f7a26a'
          '2d7b8414ddce5f401331342ac1529c22'
@@ -97,11 +97,12 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
          '33fbebbd546672cedd3c5e7350ab414e'
          'c773d8caacba8fbd4968e8afe5137bc6'
          '3edef50a49a47694bf8add39cc160add'
-         '01cbbf411d2a585feb71f2881755e5d8'
+         '88c9c36430875f9530edb79e11dc770a'
          'f421f670a9c74724037f70d1dabcad00'
          'eab2d188992b1ac561e0ba968544d7a3'
          '74e17d6f7453c52d56fecaed5c3f6ad5'
          '47e093e8cfe4b5b96602358e1f540832'
+         '4cc3401a94500fad269b25c60d99cc4d'
          '727a886a1ba237906f48cda2e4e7844b'
          '0c81e5cad656f6260e39cd7585b1421a'
          'e5bb027c54a2727d0bcf8d6fb357ba32'
diff --git a/abs/core/LinHES-system/enableIRWake.sh b/abs/core/LinHES-system/enableIRWake.sh
new file mode 100755
index 0000000..5b971b7
--- /dev/null
+++ b/abs/core/LinHES-system/enableIRWake.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+for vendProdID in `lsusb | sed -e 's/.*ID \([a-f0-9]\+:[a-f0-9]\+\).*/\1/g'`
+do
+    foundRemote=`grep -i "$vendProdID" /usr/MythVantage/templates/remotes/receiver_usb.id`
+    if [[ $? = 0 ]]
+    then
+        #echo Found: $foundRemote
+        vendID=`echo $vendProdID | cut -d":" -f1`
+        prodID=`echo $vendProdID | cut -d":" -f2`
+        for usbDevice in `grep . /sys/bus/usb/devices/*/power/wakeup | cut -d"/" -f6`
+        do
+            foundVendID=`cat /sys/bus/usb/devices/$usbDevice/idVendor`
+            foundProdID=`cat /sys/bus/usb/devices/$usbDevice/idProduct`
+            if [[ $foundVendID == $vendID && $foundProdID == $prodID ]]
+            then
+                echo "Enable wake for $foundRemote on $usbDevice"
+                sudo sh -c "echo 'enabled' > /sys/bus/usb/devices/$usbDevice/power/wakeup"
+            fi
+        done
+    fi
+done
diff --git a/abs/core/LinHES-system/lh_system_backup_job b/abs/core/LinHES-system/lh_system_backup_job
index 8539ff2..e248e1a 100755
--- a/abs/core/LinHES-system/lh_system_backup_job
+++ b/abs/core/LinHES-system/lh_system_backup_job
@@ -117,7 +117,16 @@ function backup(){
     done
 
     echo "Backup home dirs"
-    tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt  $MYTHHOME /home/vncsvc /home/xymon
+    HOMEDIRS=""
+    if [ -d /home/vncsvc ]
+    then
+        HOMEDIRS="/home/vncsvc"
+    fi
+    if [ -d /home/xymon ]
+    then
+        HOMEDIRS="$HOMEDIRS /home/xymon"
+    fi
+    tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt  $MYTHHOME $HOMEDIRS
 
     if [ -f $MYTHHOME/backup_config/backup_include.txt ]
     then
diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD
index 5d77379..730c7c4 100644
--- a/abs/core/keylaunch/PKGBUILD
+++ b/abs/core/keylaunch/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=keylaunch
 pkgver=1.3.9
-pkgrel=9
-arch=('i686' 'x86_64')
-pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. "
+pkgrel=10
+arch=('x86_64')
+pkgdesc="KeyLaunch is a small utility for binding commands to a hot key."
 url="http://www.oroborus.org/"
 depends=(glibc)
 source=(http://ftp.debian.org/debian/pool/main/k/keylaunch/keylaunch_1.3.9.tar.gz example_rc)
@@ -12,11 +12,12 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
-  make DESTDIR=$pkgdir install
 }
 
 package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
   install -D -m0755 $srcdir/example_rc $pkgdir/etc/keylaunchrc
 }
 md5sums=('710f68a3e7026b4139cc94ea790576c3'
-         '1141e182e2accb02c17548189bead4dc')
+         '3d6845a9c30fc511a6202246d5a840e3')
diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc
index 8d409df..e80c920 100644
--- a/abs/core/keylaunch/example_rc
+++ b/abs/core/keylaunch/example_rc
@@ -16,10 +16,9 @@ key=.**u:/usr/LH/bin/unclutter-toggle.sh
 key=..*h:/usr/MythVantage/bin/mythinstall -H
 key=..*m:/usr/LH/bin/mythfrontend-start
 key=..*f:sudo sv restart frontend
-key=..*w:/usr/bin/google-chrome --no-first-run||msg_client.py --msg "Chrome is not installed."
+key=..*w:/usr/bin/google-chrome --no-first-run --start-maximized ||msg_client.py --msg "Chrome is not installed."
 
 
 key=..*1:/usr/LH/bin/lh_backend_control.sh start
 key=..*2:/usr/LH/bin/lh_backend_control.sh stop
 key=..*3:/usr/LH/bin/lh_backend_control.sh restart
-
diff --git a/abs/core/libpciaccess/PKGBUILD b/abs/core/libpciaccess/PKGBUILD
index 4b5bc2e..b8fdbdd 100644
--- a/abs/core/libpciaccess/PKGBUILD
+++ b/abs/core/libpciaccess/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libpciaccess
-pkgver=0.13.1
+pkgver=0.14
 pkgrel=1
 pkgdesc="X11 PCI access library"
-arch=(i686 x86_64)
+arch=(x86_64)
 license=('custom')
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
+makedepends=('xorg-util-macros')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha512sums=('bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b'
+            'SKIP')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith@oracle.com>
+validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # "Emil Velikov <emil.l.velikov@gmail.com>" 
+validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax@nwnk.net>"
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD
index f275e0d..6c0d18f 100755
--- a/abs/core/linhes-theme/PKGBUILD
+++ b/abs/core/linhes-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-theme
 pkgver=8.6.0
-pkgrel=2
+pkgrel=4
 pkgdesc="Default LinHES MythTV theme"
 arch=('x86_64')
 license=('GPL2')
@@ -101,8 +101,8 @@ package() {
     sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml
 }
 md5sums=('2dca856c2a4d1f959473512c94e43b60'
-         '3fc2c8838a9e331a2d19c114760a5acb'
-         '391f8e5d43ca846b04a5e8119dccc8cf'
+         '7ad16012e4c5f9419089e42c539fe6af'
+         '31cd00ab3f10329a15f238dbe2b43708'
          'd1d54968a2297924673d9653f707df33'
          '25ff929dc4aca3b2a0bd38d9ded5a6b8'
          '26a6db272dee225b9e4dc282f1494e51'
@@ -115,7 +115,7 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          '643e7d548587b8742ed5accb6d736257'
          'dd1e013e806efc26049ea89637a51f83'
          '9fe3371a8b964a7028126405cfaa330b'
-         '814b52b7ad9a6918585764f5790d1c3b'
+         '9eb628e751ad0cccc199779b5b23ac16'
          '373e1fd01ba18640992bd5d2e7fd7bfe'
          '384871202030f41148536e2e89bb1801'
          '8efbd524cef4dd3f5fbe5b7d5ad854f0'
@@ -136,6 +136,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60'
          'e8ac15e38b3dc99c9e889e439ba356de'
          'e8cf0d3a55ba3be47deae55c05432141'
          '3f600b966bd813dd27f620762ddb3ac8'
-         'e92bd22caf09a1d2b709f4d5b2519540'
+         '4f9e4db179e80eb96a202d319f1b835c'
          'b51ef0cbf8ed2d3a8c1a8257a89aceff'
          '09ad14842f828b7a8d24070ec8214fe5')
diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch
index 1357b37..51c7c72 100644
--- a/abs/core/linhes-theme/base.xml.patch
+++ b/abs/core/linhes-theme/base.xml.patch
@@ -1,5 +1,5 @@
 --- base.xml.orig	2018-04-17 14:44:34.438582684 +0000
-+++ base.xml	2018-05-24 19:32:20.152603456 +0000
++++ base.xml	2019-03-22 17:16:10.683904892 +0000
 @@ -3,55 +3,55 @@
  <mythuitheme>
  
@@ -967,3 +967,12 @@
          </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/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch
index a5629d4..d406747 100644
--- a/abs/core/linhes-theme/osd.xml.patch
+++ b/abs/core/linhes-theme/osd.xml.patch
@@ -1,5 +1,5 @@
---- osd.xml.orig	2016-11-16 18:00:59.736588734 +0000
-+++ osd.xml	2017-01-13 18:57:07.721509072 +0000
+--- 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>
@@ -254,7 +254,357 @@
          </fontdef>
  
          <shape name="osd-input-backdrop">
-@@ -378,9 +366,9 @@
+@@ -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>
  
@@ -266,7 +616,7 @@
          </fontdef>
  
          <shape name="osd-status-backdrop">
-@@ -436,12 +424,19 @@
+@@ -436,12 +771,19 @@
              <align>left,vcenter</align>
          </textarea>
  
@@ -290,7 +640,7 @@
          </textarea>
  
          <clock name="clock">
-@@ -470,39 +465,39 @@
+@@ -470,39 +812,39 @@
      <window name="program_info">
          <area>0,0,1280,720</area>
  
@@ -341,7 +691,7 @@
          </fontdef>
  
          <shape name="program-info-backdrop">
-@@ -628,7 +623,7 @@
+@@ -628,7 +970,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -350,7 +700,7 @@
                  </textarea>
              </state>
              <state name="WatchingPreRecorded">
-@@ -685,7 +680,7 @@
+@@ -685,7 +1027,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -359,7 +709,7 @@
                  </textarea>
              </state>
              <state name="PCM_BLURAY">
-@@ -787,7 +782,7 @@
+@@ -787,7 +1129,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -368,7 +718,7 @@
                  </textarea>
              </state>
              <state name="2">
-@@ -805,7 +800,7 @@
+@@ -805,7 +1147,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -377,7 +727,7 @@
                  </textarea>
              </state>
              <state name="6">
-@@ -823,7 +818,7 @@
+@@ -823,7 +1165,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -386,7 +736,7 @@
                  </textarea>
              </state>
              <state name="8">
-@@ -832,7 +827,7 @@
+@@ -832,7 +1174,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -395,7 +745,7 @@
                  </textarea>
              </state>
          </statetype>
-@@ -865,6 +860,15 @@
+@@ -865,6 +1207,15 @@
                      <value>VideoCodec: H.264</value>
                  </textarea>
              </state>
@@ -411,7 +761,7 @@
              <state name="MPEG-4">
                  <textarea name="MPEG-4">
                      <area>830,432,180,16</area>
-@@ -910,7 +914,7 @@
+@@ -910,7 +1261,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -420,7 +770,7 @@
                  </textarea>
              </state>
              <state name="HD_720_P">
-@@ -919,7 +923,7 @@
+@@ -919,7 +1270,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -429,7 +779,7 @@
                  </textarea>
              </state>
              <state name="HD_1080_I">
-@@ -928,7 +932,7 @@
+@@ -928,7 +1279,7 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -438,7 +788,7 @@
                  </textarea>
              </state>
              <state name="HD_1080_P">
-@@ -937,23 +941,32 @@
+@@ -937,23 +1288,32 @@
                      <font>supersmallblue</font>
                      <cutdown>no</cutdown>
                      <align>allcenter</align>
@@ -478,7 +828,7 @@
          </textarea>
  
          <imagetype name="coverart">
-@@ -988,13 +1001,22 @@
+@@ -988,13 +1348,22 @@
              <alpha>255</alpha>
          </imagetype>
  
@@ -502,7 +852,7 @@
          <textarea name="description">
              <font>small</font>
              <area>284,523,912,126</area>
-@@ -1003,37 +1025,62 @@
+@@ -1003,37 +1372,62 @@
              <template>%"|SUBTITLE|"  %%YEARSTARS| %%DESCRIPTION%</template>
          </textarea>
  
@@ -572,7 +922,7 @@
          </fontdef>
  
          <shape name="browse-info-backdrop">
-@@ -1084,7 +1131,7 @@
+@@ -1084,7 +1478,7 @@
          </shape>
  
          <shape name="title-backdrop-line">
@@ -581,7 +931,7 @@
              <type>roundbox</type>
              <fill color="#000000" alpha="0" />
              <line color="#ffffff" alpha="45" width="2" />
-@@ -1092,11 +1139,11 @@
+@@ -1092,11 +1486,11 @@
          </shape>
  
          <shape name="title-top-line" from="channel-top-line">
@@ -595,7 +945,7 @@
          </shape>
  
          <shape name="title-left-line" from="channel-left-line">
-@@ -1104,30 +1151,6 @@
+@@ -1104,30 +1498,6 @@
          </shape>
  
          <shape name="title-right-line" from="channel-left-line">
@@ -626,7 +976,7 @@
              <area>1212,492,2,62</area>
          </shape>
  
-@@ -1175,30 +1198,29 @@
+@@ -1175,30 +1545,29 @@
          </textarea>
  
          <textarea name="title">
@@ -667,7 +1017,7 @@
          </clock>
  
          <textarea name="description">
-@@ -1214,9 +1236,9 @@
+@@ -1214,9 +1583,9 @@
      <window name="ChannelEditor">
          <area>0,0,1280,720</area>
  
@@ -679,7 +1029,7 @@
          </fontdef>
  
          <fontdef name="smallblack" from="small">
-@@ -1224,7 +1246,7 @@
+@@ -1224,7 +1593,7 @@
          </fontdef>
  
          <fontdef name="smallblue" from="small">
@@ -688,7 +1038,7 @@
          </fontdef>
  
          <fontdef name="smallgrey" from="small">
-@@ -1232,7 +1254,7 @@
+@@ -1232,7 +1601,7 @@
          </fontdef>
  
          <fontdef name="medium" from="small">
@@ -697,7 +1047,7 @@
          </fontdef>
  
          <shape name="channel-editor-backdrop">
-@@ -1610,9 +1632,9 @@
+@@ -1610,9 +1979,9 @@
      <window name="osd_program_editor">
          <area>0,0,1280,720</area>
  
@@ -709,7 +1059,7 @@
          </fontdef>
  
          <shape name="osd-program-editor-backdrop">
-@@ -1663,13 +1685,17 @@
+@@ -1663,13 +2032,17 @@
          </shape>
  
          <textarea name="title">
@@ -730,7 +1080,7 @@
              <align>right,vcenter</align>
          </textarea>
  
-@@ -1749,9 +1775,9 @@
+@@ -1749,9 +2122,9 @@
      <window name="MythPopupBox">
          <area>0,0,1280,720</area>
  
@@ -742,7 +1092,7 @@
          </fontdef>
  
          <fontdef name="smallgrey" from="small">
-@@ -1759,7 +1785,7 @@
+@@ -1759,7 +2132,7 @@
          </fontdef>
  
          <fontdef name="smallyellow" from="small">
@@ -751,7 +1101,7 @@
          </fontdef>
  
          <shape name="mythpopupbox-backdrop">
-@@ -1810,7 +1836,7 @@
+@@ -1810,7 +2183,7 @@
          </shape>
  
          <shape name="message-area-seperator-line">
@@ -760,7 +1110,7 @@
              <type>box</type>
              <fill style="gradient">
                  <gradient direction="horizontal" alpha="45">
-@@ -1822,21 +1848,21 @@
+@@ -1822,21 +2195,21 @@
          </shape>
  
          <shape name="mythpopup-box-arrows-backdrop">
@@ -787,7 +1137,7 @@
              <layout>vertical</layout>
              <spacing>4</spacing>
              <showarrow>yes</showarrow>
-@@ -1922,7 +1948,7 @@
+@@ -1922,7 +2295,7 @@
                          </fill>
                      </shape>
                      <textarea name="buttontext">
@@ -796,7 +1146,7 @@
                      </textarea>
                      <imagetype name="buttonarrow">
                          <alpha>255</alpha>
-@@ -1964,7 +1990,7 @@
+@@ -1964,7 +2337,7 @@
                  </state>
              </statetype>
              <statetype name="upscrollarrow">
@@ -805,7 +1155,7 @@
                  <state type="off">
                      <imagetype name="upon">
                          <filename>images/osd/lists_up_arrow.png</filename>
-@@ -1978,7 +2004,7 @@
+@@ -1978,7 +2351,7 @@
                  </state>
              </statetype>
              <statetype name="downscrollarrow">
diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch
index 15d80fc..205d671 100644
--- a/abs/core/linhes-theme/recordings-ui.xml.patch
+++ b/abs/core/linhes-theme/recordings-ui.xml.patch
@@ -1,5 +1,5 @@
 --- recordings-ui.xml.orig	2018-05-25 17:44:18.266763054 +0000
-+++ recordings-ui.xml	2018-05-25 17:43:56.879526676 +0000
++++ recordings-ui.xml	2019-03-24 22:52:51.874815241 +0000
 @@ -105,19 +105,11 @@
          </shape>
  
@@ -158,12 +158,19 @@
          </textarea>
  
          <imagetype name="no_preview_image_without_fanart" depends="!fanart">
-@@ -688,7 +674,7 @@
-         <textarea name="norecordings">
-             <area>350,87,906,351</area>
-             <font>basemedium</font>
+@@ -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>
-+            <value>No recordings available.</value>
++        <textarea name="norecordings" from="basetextarea">
++            <area>38,498,833,140</area>
              <multiline>yes</multiline>
-             <align>allcenter</align>
+-            <align>allcenter</align>
++            <value>No recordings are available.</value>
          </textarea>
+ 
+         <group name="clock-backdrop-group" from="base_clock_backdrop_group" />
diff --git a/abs/core/linhes-theme/standardsetting-ui.xml b/abs/core/linhes-theme/standardsetting-ui.xml
index 255b120..75ff02f 100644
--- a/abs/core/linhes-theme/standardsetting-ui.xml
+++ b/abs/core/linhes-theme/standardsetting-ui.xml
@@ -6,109 +6,65 @@
         <textarea name="title" from="base_heading">
             <value>Settings</value>
         </textarea>
-<!--
-        <shape name="group-help-backdrop" from="base_backdrop" depends="grouphelp">
-            <area>20,86,1240,420</area>
-            <area>20,36,1240,40</area>
-        </shape>
-
-        <shape name="group-help-backdrop-line" from="base_backdrop_line" depends="grouphelp">
-            <area>21,87,1238,418</area>
-            <area>21,37,1238,37</area>
-        </shape>
-
-        <shape name="group-help-top-line" from="base_highlight_line" depends="grouphelp">
-            <area>22,88,1236,2</area>
-            <area>22,38,1236,2</area>
-        </shape>
-
-        <shape name="group-help-bottom-line" from="base_highlight_line" depends="grouphelp">
-            <area>22,502,1236,2</area>
-            <area>22,72,1236,2</area>
-        </shape>
-
-        <shape name="group-help-left-line" from="base_highlight_vertical_line" depends="grouphelp">
-            <area>22,90,2,412</area>
-            <area>22,40,2,32</area>
-        </shape>
-
-        <shape name="group-help-right-line" from="base_highlight_vertical_line" depends="grouphelp">
-            <area>1256,90,2,412</area>
-            <area>1256,40,2,32</area>
-        </shape>
--->
-
-        <shape name="group-help-backdrop" from="base_backdrop">
-            <area>0,36,1280,40</area>
-            <type>box</type>
-        </shape>
-
-        <shape name="group-help-top-line" from="base_line">
-            <area>0,37,1280,2</area>
-        </shape>
-
-        <shape name="group-help-bottom-line" from="base_line">
-            <area>0,73,1280,2</area>
-        </shape>
 
         <shape name="settings-list-backdrop" from="base_backdrop">
-            <area>20,86,1240,420</area>
+            <area>20,36,1240,488</area>
         </shape>
 
         <shape name="settings-list-backdrop-line" from="base_backdrop_line">
-            <area>21,87,1238,418</area>
+            <area>21,37,1238,484</area>
         </shape>
 
         <shape name="settings-list-top-line" from="base_highlight_line">
-            <area>22,88,1236,2</area>
+            <area>22,38,1236,2</area>
         </shape>
 
         <shape name="settings-list-bottom-line" from="base_highlight_line">
-            <area>22,502,1236,2</area>
+            <area>22,518,1236,2</area>
         </shape>
 
         <shape name="settings-list-left-line" from="base_highlight_vertical_line">
-            <area>22,90,2,412</area>
+            <area>22,40,2,476</area>
         </shape>
 
         <shape name="settings-list-right-line" from="base_highlight_vertical_line">
-            <area>1256,90,2,412</area>
+            <area>1256,40,2,476</area>
         </shape>
 
         <shape name="settings-list-arrows-backdrop" from="base_arrows_backdrop">
-            <area>1207,506,50,11</area>
+            <area>1207,522,50,11</area>
         </shape>
 
         <shape name="settings-bottom-backdrop" from="base_backdrop">
-            <area>20,516,1240,169</area>
+            <area>20,532,1240,154</area>
         </shape>
 
         <shape name="settings-bottom-backdrop-line" from="base_backdrop_line">
-            <area>21,517,1238,167</area>
+            <area>21,533,1238,150</area>
         </shape>
 
         <shape name="settings-bottom-top-line" from="base_highlight_line">
-            <area>22,518,1236,2</area>
+            <area>22,534,1236,2</area>
         </shape>
 
         <shape name="settings-bottom-bottom-line" from="base_highlight_line">
-            <area>22,681,1236,2</area>
+            <area>22,680,1236,2</area>
         </shape>
 
         <shape name="settings-bottom-left-line" from="base_highlight_vertical_line">
-            <area>22,520,2,161</area>
+            <area>22,536,2,146</area>
         </shape>
 
         <shape name="settings-bottom-right-line" from="base_highlight_vertical_line">
-            <area>1256,520,2,161</area>
+            <area>1256,536,2,146</area>
         </shape>
 
         <shape name="settings-bottom-seperator-first-line" from="base_line">
-            <area>43,554,1194,2</area>
+            <area>43,609,1194,2</area>
         </shape>
 
         <buttonlist name="settingslist" from="base_list">
-            <area>28,94,1224,404</area>
+            <area>28,43,1224,472</area>
             <layout>vertical</layout>
             <spacing>4</spacing>
             <scrollstyle>free</scrollstyle>
@@ -123,7 +79,7 @@
                     </group>
 
                     <textarea name="buttontext">
-                        <area>15,0,50%-5,30</area>
+                        <area>25,0,50%-5,30</area>
                     </textarea>
                    
                     <group name="widgets">
@@ -204,7 +160,7 @@
                     </imagetype>
 
                     <textarea name="buttontext">
-                        <area>33,0,1194,64</area>
+                        <area>25,0,1194,64</area>
                         <font>basesmallyellow</font>
                         <align>left,vcenter</align>
                         <scroll direction="horizontal" />
@@ -314,36 +270,31 @@
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
-                <position>1186,413</position>
+                <position>1186,479</position>
             </statetype>
             <statetype name="downscrollarrow">
-                <position>1206,413</position>
+                <position>1206,479</position>
             </statetype>
         </buttonlist>
 
-        <!-- optional, display the help for the current group of settings -->
-        <textarea name="grouphelp" from="basetextarea">
-            <area>0,37,1280,37</area>
-            <font>basesmall</font>
+        <!-- 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>no</multiline>
-            <scroll direction="horizontal" returnrate="2000" />
-        </textarea>
-
-        <textarea name="helplabel">
-            <area>44,520,1192,34</area>
-            <font>basemediumyellow</font>
-            <align>left,vcenter</align>
-            <value>Details</value>
+            <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
         </textarea>
 
-        <!-- optional, display the help for the currently selected setting -->
-        <textarea name="selectedsettinghelp" from="basetextarea">
-            <area>44,561,1192,124</area>
+        <!-- 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>left</align>
+            <align>allcenter</align>
             <multiline>yes</multiline>
+            <scroll direction="up" rate="20" startdelay="5"/>
         </textarea>
+
     </window>
 
     <window name="terminal">
diff --git a/abs/core/mythtv/stable-30/git_src/git_hash b/abs/core/mythtv/stable-30/git_src/git_hash
index 49df4ff..9ec3c6c 100644
--- a/abs/core/mythtv/stable-30/git_src/git_hash
+++ b/abs/core/mythtv/stable-30/git_src/git_hash
@@ -1 +1 @@
-60cfb7c05ae21d0049537aaa66f8f70a836a1138
+4d995941851b277b6365fed4ea003b8706432c2d
diff --git a/abs/core/mythtv/stable-30/mythplugins/PKGBUILD b/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
index 7828a2c..0feb529 100644
--- a/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-30/mythplugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=30.0
-pkgrel=5
+pkgrel=7
 arch=('x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-30/mythtv/PKGBUILD b/abs/core/mythtv/stable-30/mythtv/PKGBUILD
index 1aefb62..9f42fe1 100644
--- a/abs/core/mythtv/stable-30/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-30/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=30.0
-pkgrel=5
+pkgrel=7
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('x86_64')
@@ -31,13 +31,13 @@ patches=(
          'autoskip_reduce_commskip_jumpback.patch'
          'change_msg_types.patch'
 #         'disable_mythnotification_tuner_failure.patch'
-         'searchMetatdataSelectedGrabber.patch'
+         'searchMetatdataSelectedGrabber.patch' #MythTV Ticket 13429
          'defaultThemeLinHES.patch'
          'addEnableDisableAutoShutdownToSystemMenu.patch'
-         'mythfrontend_en_us.ts_Title_Case.patch'
-         'fixTranslations.patch'
+         'mythfrontend_en_us.ts_Title_Case.patch' #MythTV Ticket 13286
+         'fixTranslations.patch' #MythTV Ticket 13286
          'pull103-Add-heuristic-in-TMDB-script-to-detect-movie-release-years.patch'
-         'addHostnameIPtoMachineStatus.patch'
+         'addHostnameIPtoMachineStatus.patch' #MythTV Ticket 13430
          'revertQTsettingsForMythinstall.patch'
          )
 
@@ -136,7 +136,7 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45'
          '0f674b9cad031ba1e03aaf6b5ee1499f'
          'b0b238320fa78a4928dce2cea7c85071'
          '8e4492d1777234a021f368bd6ee964ee'
-         '208f46d91c5911e9572d300d89381d7b'
+         '55f9ed657dc84e3fe0c1462c05c57447'
          '72404ebfec2f18536ccc10d8e2bc8757'
          'd05eaf66c434a131c8efb4d87e99b402'
          'b3ae1cc55f40c6953121415e08c166f4'
diff --git a/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
index 2669566..54198c5 100644
--- a/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
+++ b/abs/core/mythtv/stable-30/mythtv/mythfrontend_en_us.ts_Title_Case.patch
@@ -1,5 +1,5 @@
 --- src/mythtv/i18n/mythfrontend_en_us.ts.orig	2019-02-25 01:33:22.413248950 +0000
-+++ src/mythtv/i18n/mythfrontend_en_us.ts	2019-03-01 22:16:23.173068477 +0000
++++ src/mythtv/i18n/mythfrontend_en_us.ts	2019-03-22 15:12:46.665338437 +0000
 @@ -4,21 +4,21 @@
  <context>
      <name>(Categories)</name>
@@ -2618,7 +2618,8 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2462"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2510"/>
          <source>If enabled, MythTV will always be on top</source>
-         <translation>If enabled, MythTV will always be on top</translation>
+-        <translation>If enabled, MythTV will always be on top</translation>
++        <translation>If enabled, MythTV will always be on top.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2470"/>
@@ -9675,31 +9676,32 @@
          <source>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</source>
 -        <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required</translation>
 +        <translation>Your iPhone, iPad, iPod Touch, or iTunes on your computer will prompt you for this password when required.</translation>
-+    </message>
-+    <message>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3297"/>
-+        <source>AirPlay - Password</source>
-+        <translation>AirPlay - Password</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3140"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3308"/>
-         <source>AirPlay full screen playback</source>
+-        <source>AirPlay full screen playback</source>
 -        <translation>AirPlay full screen playback</translation>
-+        <translation>AirPlay Fullscreen Playback</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3297"/>
++        <source>AirPlay - Password</source>
++        <translation>AirPlay - Password</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3144"/>
-+        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3312"/>
-         <source>During music playback, displays album cover and various media information in full screen mode</source>
-         <translation>During music playback, displays album cover and various media information in full screen mode</translation>
+-        <source>During music playback, displays album cover and various media information in full screen mode</source>
+-        <translation>During music playback, displays album cover and various media information in full screen mode</translation>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3308"/>
++        <source>AirPlay full screen playback</source>
++        <translation>AirPlay Fullscreen Playback</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3154"/>
 -        <source>All AirPlay settings take effect when you restart MythFrontend.</source>
 -        <translation>All AirPlay settings take effect when you restart MythFrontend.</translation>
--    </message>
--    <message>
++        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3312"/>
++        <source>During music playback, displays album cover and various media information in full screen mode</source>
++        <translation>During music playback, displays album cover and various media information in full screen mode.</translation>
+     </message>
+     <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="3165"/>
 -        <source>AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</source>
 -        <translation>AirTunes RSA key couldn&apos;t be loaded. Check http://www.mythtv.org/wiki/AirTunes/AirPlay. Last Error: %1</translation>
@@ -14712,8 +14714,7 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="712"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="770"/>
          <source>Example custom filter list: &apos;ivtc,denoise3d&apos;</source>
--        <translation>Example custom filter list: &apos;ivtc,denoise3d&apos;</translation>
-+        <translation>Example Custom Filter List: &apos;ivtc,denoise3d&apos;</translation>
+         <translation>Example custom filter list: &apos;ivtc,denoise3d&apos;</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="715"/>
@@ -14736,21 +14737,19 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="920"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="978"/>
 +        <source>Invalid frame rate specification(%1), discarded</source>
-+        <translation>Invalid Frame Rate Specification(%1), Discarded</translation>
++        <translation>Invalid Frame Rate Specification (%1), Discarded</translation>
 +    </message>
 +    <message>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1057"/>
          <source>Main deinterlacing method. %1</source>
--        <translation>Main deinterlacing method. %1</translation>
-+        <translation>Main Deinterlacing Method. %1</translation>
+         <translation>Main deinterlacing method. %1</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="927"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1064"/>
          <source>Fallback deinterlacing method. %1</source>
--        <translation>Fallback deinterlacing method. %1</translation>
-+        <translation>Fallback Deinterlacing Method. %1</translation>
-+    </message>
+         <translation>Fallback deinterlacing method. %1</translation>
+     </message>
 +    <message>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1089"/>
 +        <source>Remove this profile item?</source>
@@ -14784,7 +14783,7 @@
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1149"/>
 +        <source>framerate</source>
 +        <translation>framerate</translation>
-     </message>
++    </message>
  </context>
  <context>
      <name>PlaybackSettings</name>
@@ -15118,7 +15117,7 @@
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1411"/>
          <source>Selects how to sort a show&apos;s episodes</source>
 -        <translation>Selects how to sort a show&apos;s episodes</translation>
-+        <translation>Selects How to Sort a Show&apos;s Episodes</translation>
++        <translation>Selects how to sort a show&apos;s episodes.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1424"/>
@@ -15309,7 +15308,8 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1738"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1754"/>
          <source>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</source>
-         <translation>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</translation>
+-        <translation>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD</translation>
++        <translation>Set the choice between viewing the current recording group in the OSD, or showing the &apos;Watch Recording&apos; screen when &apos;Jump to Program&apos; is activated. If enabled, the recordings are shown in the OSD.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="1751"/>
@@ -20624,13 +20624,14 @@
 +        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1801"/>
          <source>OSD rendering method</source>
 -        <translation>OSD rendering method</translation>
-+        <translation>OSD Rendering Method</translation>
++        <translation>OSD rendering method.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1433"/>
 +        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1807"/>
          <source>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</source>
-         <translation>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</translation>
+-        <translation>Render the OSD using the XVideo chromakey feature.This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</translation>
++        <translation>Render the OSD using the XVideo chromakey feature. This renderer does not alpha blend but is the fastest OSD renderer for XVideo.</translation>
      </message>
      <message>
 -        <location filename="../libs/libmythtv/videodisplayprofile.cpp" line="1437"/>
@@ -28909,7 +28910,8 @@
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2298"/>
 +        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2361"/>
          <source>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</source>
-         <translation>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</translation>
+-        <translation>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available</translation>
++        <translation>Default refresh rate when watching a video. Leave at &quot;Auto&quot; to automatically use the best available.</translation>
      </message>
      <message>
 -        <location filename="../programs/mythfrontend/globalsettings.cpp" line="2302"/>
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 11aee66..215e019 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=runit-scripts
-pkgver=8.5
+pkgver=8.6
 pkgrel=4
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
index a376059..a15a911 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+MYTH_RUN_STATUS="1"
 set -e
 /usr/bin/alsactl restore
 exec chpst -b alsa pause
diff --git a/abs/core/runit-scripts/runitscripts/services/apcupsd/run b/abs/core/runit-scripts/runitscripts/services/apcupsd/run
index 70bd9e0..7d9034e 100755
--- a/abs/core/runit-scripts/runitscripts/services/apcupsd/run
+++ b/abs/core/runit-scripts/runitscripts/services/apcupsd/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 exec 2>&1
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 
diff --git a/abs/core/runit-scripts/runitscripts/services/autofs/run b/abs/core/runit-scripts/runitscripts/services/autofs/run
index c0800a2..941d59c 100755
--- a/abs/core/runit-scripts/runitscripts/services/autofs/run
+++ b/abs/core/runit-scripts/runitscripts/services/autofs/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 exec 2>&1
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 
diff --git a/abs/core/runit-scripts/runitscripts/services/certmaster/run b/abs/core/runit-scripts/runitscripts/services/certmaster/run
index 0f5add7..f3ac054 100644
--- a/abs/core/runit-scripts/runitscripts/services/certmaster/run
+++ b/abs/core/runit-scripts/runitscripts/services/certmaster/run
@@ -1,4 +1,5 @@
 #!/bin/bash
+MYTH_RUN_STATUS="1"
 if [ ! -e /etc/pki/certmaster/ca/certmaster.key ]
 then
     /usr/bin/certmaster daemon
diff --git a/abs/core/runit-scripts/runitscripts/services/irexec/run b/abs/core/runit-scripts/runitscripts/services/irexec/run
index 01b775a..bd6f418 100644
--- a/abs/core/runit-scripts/runitscripts/services/irexec/run
+++ b/abs/core/runit-scripts/runitscripts/services/irexec/run
@@ -1,7 +1,7 @@
 #!/bin/sh
 exec 2>&1
 export TERM=linux
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/profile
diff --git a/abs/core/runit-scripts/runitscripts/services/mysql/run b/abs/core/runit-scripts/runitscripts/services/mysql/run
index 8fad493..51dc27f 100755
--- a/abs/core/runit-scripts/runitscripts/services/mysql/run
+++ b/abs/core/runit-scripts/runitscripts/services/mysql/run
@@ -1,6 +1,7 @@
 #!/bin/bash
 exec 2>&1
 export TERM=linux
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting Mysql"
diff --git a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
index 6d0b04e..a6e521a 100755
--- a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
+++ b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
@@ -1,6 +1,7 @@
 #!/bin/sh
 exec 2>&1
 export TERM=linux
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/conf.d/plexmediaserver
@@ -17,4 +18,4 @@ export LC_ALL="${LANG}"
 export LANG="${LANG}"
 ulimit -s 3000
 
-exec chpst -uplex:plex /opt/plexmediaserver/Plex\ Media\ Server
+exec chpst -uplex:plex /usr/lib/plexmediaserver/Plex\ Media\ Server
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 9fbb16e..9c61daa 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -8,7 +8,7 @@ export TERM=linux
 LOG=/tmp/remotes.log
 
 MODPROBE="/usr/bin/modprobe"
-LIRCD="/usr/bin/lircd "
+LIRCD="/usr/bin/lircd"
 
 SETSERIAL="/usr/bin/setserial"
 
@@ -112,7 +112,7 @@ else
 
     if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
     then
-        CMD="$LIRCD-r -n  --driver=commandir"
+        CMD="$LIRCD --release --nodaemon --driver=commandir"
         printhl "   Using commandir"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -120,7 +120,7 @@ else
     elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
     then
         sv start igdaemon
-        CMD="$LIRCD-r -n  --driver=iguanaIR"
+        CMD="$LIRCD --release --nodaemon --driver=iguanaIR"
         printhl "       Using iguanaIR usb"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -128,7 +128,7 @@ else
     elif [ x$ReceiverType = "xSiliconDust_HDHR" ]
     then
         # if using the SiliconDust_HDHR as an I/R Receiver
-        CMD="$LIRCD-H udp -d 5000 -n"
+        CMD="$LIRCD --nodaemon --driver=udp --device=5000"
         printhl "   Using SiliconDust on port 5000"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -177,7 +177,7 @@ else
                     DEFINED_RECEIVER="False"
                     for i in `seq 1 $num_lirc`
                     do
-                        CMD="$LIRCD-r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                        CMD="$LIRCD --release --device=/dev/lirc$i --driver=default --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
                         printhl "   Device $i"
                         echo $CMD >>$LOG
                         $CMD >>$LOG 2>>$LOG
@@ -216,24 +216,24 @@ else
             then
                 #start receiver
                 #start blaster  chain
-                CMD="$LIRCD-r -d $IRNODE --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
-                LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                CMD="$LIRCD --release --device=$IRNODE --driver=default --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
+                LCMD="$LIRCD --release --nodaemon --device=$BLASTERNODE --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
                 echo $CMD >>$LOG
                 $CMD >>$LOG 2>>$LOG
 
             elif [ x$USE_BLASTER = xTrue ]
             then
                 #start only the blaster
-                LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD --release --nodaemon --device=$BLASTERNODE --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
 
             elif [ x$DEFINED_RECEIVER = xTrue ]
             then
                 #start reciever
-                LCMD="$LIRCD-r -n -d $IRNODE --output /var/run/lirc/lircd"
+                LCMD="$LIRCD --release --nodaemon --device=$IRNODE --driver=default --output=/var/run/lirc/lircd"
 
             else
                 #default case of /dev/lirc0
-                LCMD="$LIRCD-r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD --release --nodaemon --device=/dev/lirc0 --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
             fi
 
             echo $LASTCMD >>$LOG
@@ -242,10 +242,8 @@ else
             
             
             
-            
             echo "Starting remotes from $LCMD" >>$LOG
             exec $LCMD >>$LOG 2>>$LOG
-
         fi
     fi
 fi
diff --git a/abs/core/runit-scripts/runitscripts/services/rpcbind/run b/abs/core/runit-scripts/runitscripts/services/rpcbind/run
index 86a961b..9853b88 100755
--- a/abs/core/runit-scripts/runitscripts/services/rpcbind/run
+++ b/abs/core/runit-scripts/runitscripts/services/rpcbind/run
@@ -4,4 +4,4 @@ export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting rpc.bind"
-exec /usr/bin/rpcbind -d
+exec /usr/bin/rpcbind -d -f
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 76bf18d..06c9ca4 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,10 +1,10 @@
 pkgbase=xymon
 pkgname=('xymonserver' 'xymonclient')
 pkgver=4.3.28
-pkgrel=7
+pkgrel=8
 pkgdesc="Xymon is a system for monitoring of hosts and networks"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.xymon.com/"
 source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz"
         'alerts.cfg'
@@ -187,7 +187,7 @@ md5sums=('14501ab2cfce9a332c1590543dfcbd0f'
          '31ac5c1f6dcc9408b64c4107b325a9a6'
          '1eee1cf4ded13fcef9f3b43faa20dbe1'
          '80d9cfac86c6d96836e6f406e35e7cf5'
-         'df77d1de72157d23a301a72288fbf7e5'
+         'd2c6d0d18bdaa40a2c82332937253cfc'
          'b1d5592fa92ef71303621964e84c2b9e'
          'f1146cc034f6d11e7d7e68f24bc89dff'
          '2a509d81ee1655130ce40bf970719e0a'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index d18a606..1d3e459 100755
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -39,8 +39,8 @@ def create_dot_file():
     tunerdict = {}
     for row in result:
        hostname = row[0]
-       dot_hostname = row[0].replace('.','_')
-       dot_hostname = row[0].replace('-','__')
+       dot_hostname = hostname.replace('.','_')
+       dot_hostname = dot_hostname.replace('-','__')
        #Find the system type
        cursor.execute("select value,data  from settings where hostname=%s and value in ('HostSystemType','HostRunFrontend');",(row))
        hostvalues=cursor.fetchall()
diff --git a/abs/extra/google-chrome/.SRCINFO b/abs/extra/google-chrome/.SRCINFO
deleted file mode 100644
index c524c00..0000000
--- a/abs/extra/google-chrome/.SRCINFO
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgbase = google-chrome
-	pkgdesc = The popular and trusted web browser by Google (Stable Channel)
-	pkgver = 72.0.3626.119
-	pkgrel = 1
-	url = https://www.google.com/chrome
-	install = google-chrome.install
-	arch = x86_64
-	license = custom:chrome
-	depends = alsa-lib
-	depends = gtk3
-	depends = libcups
-	depends = libxss
-	depends = libxtst
-	depends = nss
-	optdepends = kdialog: for file dialogs in KDE
-	optdepends = gnome-keyring: for storing passwords in GNOME keyring
-	optdepends = kwallet: for storing passwords in KWallet
-	optdepends = gtk3-print-backends: for printing
-	optdepends = libunity: for download progress on KDE
-	optdepends = ttf-liberation: fix fonts for some PDFs (CRBug #369991)
-	optdepends = xdg-utils
-	options = !emptydirs
-	options = !strip
-	source = google-chrome-stable_72.0.3626.119_amd64.deb::https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-	source = eula_text.html
-	source = google-chrome-stable.sh
-	md5sums = 337c55d76bc54503cbadaa8d67e05446
-	md5sums = d50d8f0a6940791eabc41c4f64e6a3cf
-	md5sums = ed4cf73982461af7d0d944c1cbf9f4e8
-
-pkgname = google-chrome
-
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index f483bde..3fcfdbc 100644
--- a/abs/extra/google-chrome/PKGBUILD
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -5,7 +5,7 @@
 # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }'
 
 pkgname=google-chrome
-pkgver=72.0.3626.119
+pkgver=73.0.3683.103
 pkgrel=1
 pkgdesc="The popular and trusted web browser by Google (Stable Channel)"
 arch=('x86_64')
@@ -55,6 +55,6 @@ package() {
   rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
   rm "$pkgdir"/opt/google/chrome/product_logo_*.png
 }
-md5sums=('337c55d76bc54503cbadaa8d67e05446'
+md5sums=('fd012dfba1d044dbbbb07a468984ef5e'
          'd50d8f0a6940791eabc41c4f64e6a3cf'
          'ed4cf73982461af7d0d944c1cbf9f4e8')
diff --git a/abs/extra/google-chrome/update_version.sh b/abs/extra/google-chrome/update_version.sh
index 0a11328..2a48b8f 100755
--- a/abs/extra/google-chrome/update_version.sh
+++ b/abs/extra/google-chrome/update_version.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 # Get channel
 CHANNEL=$(awk -F '=' '/^_channel/{ print $2 }' PKGBUILD)
-PKG="google-chrome-${CHANNEL}"
+PKG="google-chrome"
 
 # Get latest version
 VER=$(curl -sL "https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz" | gzip -df |
@@ -24,8 +24,11 @@ if (git diff --exit-code PKGBUILD); then
 fi
 
 # Update .SRCINFO
-makepkg --printsrcinfo >.SRCINFO
+#makepkg --printsrcinfo >.SRCINFO
+
+# Build
+mpv2.py --rmold
 
 # Commit changes
-git add PKGBUILD .SRCINFO
-git commit -m "${PKG} v${VER}"
+git add PKGBUILD
+git commit -m "${PKG}: update to  v${VER}"
diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD
deleted file mode 100644
index c896f7e..0000000
--- a/abs/extra/huludesktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-pkgname=huludesktop
-pkgver=0.9.8
-pkgrel=1
-pkgdesc="Hulu Desktop for Linux"
-arch=('x86_64')
-url="http://www.hulu.com/labs/hulu-desktop-linux"
-license=('custom')
-depends=('glib2' 'gtk2' 'lirc' 'flashplugin')
-backup=('home/mythtv/.huludesktop')
-install=huludesktop.install
-options=('')
-source=('http://download.hulu.com/huludesktop_amd64.deb' 'huludesktop' 'huludesktop.sh' 'huludesktop_is.conf')
-. /usr/MythVantage/bin/install_functions.sh
-home_check
-
-package() {
-    cd $srcdir
-    ar p huludesktop_amd64.deb data.tar.gz | (cd $pkgdir; bsdtar xf -)
-    mkdir -p $pkgdir/$MYTHHOME
-    mkdir -p $pkgdir/usr/LH/bin
-    cp huludesktop $pkgdir/$MYTHHOME/.huludesktop
-    install -D -m755 huludesktop.sh ${pkgdir}/usr/LH/bin
-
-    #add in file for gen_is.xml
-    install -D -m0744 ${srcdir}/huludesktop_is.conf ${pkgdir}/etc/gen_is_xml.d/huludesktop_is.conf 
-}
-
-md5sums=('bccc94d7f327989dab2653d254f40869'
-         '77b7241a4ec8402ba37f1f1811336ea3'
-         '8f7dbf19d6168bc3a5b0c1da1c878693'
-         '224ed61a3ecfd6aa37d27d1c71426a3c')
diff --git a/abs/extra/huludesktop/__changelog b/abs/extra/huludesktop/__changelog
deleted file mode 100644
index 93ed61a..0000000
--- a/abs/extra/huludesktop/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-gen_is_xml.py huludesktop_is.xml
diff --git a/abs/extra/huludesktop/huludesktop b/abs/extra/huludesktop/huludesktop
deleted file mode 100644
index dee8778..0000000
--- a/abs/extra/huludesktop/huludesktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[display]
-fullscreen = TRUE
-width = 1920
-height = 1080
-pos_x = 0
-pos_y = 0
-
-[remote]
-lirc_device = /var/run/lirc/lircd
-lirc_remote_identifier = mceusb
-lirc_release_suffix = _UP
-lirc_repeat_threshold = 10
-button_name_up = Up
-button_name_down = Down
-button_name_left = Left
-button_name_right = Right
-button_name_select = OK
-button_name_menu = Home
-
-[flash]
-flash_location = /usr/lib/mozilla/plugins/libflashplayer.so
-
-[version]
-latest = (null)
-eula_version = 1
diff --git a/abs/extra/huludesktop/huludesktop.install b/abs/extra/huludesktop/huludesktop.install
deleted file mode 100644
index abe069f..0000000
--- a/abs/extra/huludesktop/huludesktop.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  gen_is_xml.py
-  chown mythtv.mythtv $MYTHHOME/.huludesktop
-  echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
-}
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    gen_is_xml.py
-    echo "Set your screen width and height in ~/.huludesktop to avoid a segfault."
-}
-post_remove() {
-    gen_is_xml.py
-}
-. /usr/MythVantage/bin/install_functions.sh
-home_check
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/huludesktop/huludesktop.sh b/abs/extra/huludesktop/huludesktop.sh
deleted file mode 100644
index 9095984..0000000
--- a/abs/extra/huludesktop/huludesktop.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#Stops xscreensaver from running. 
-stop_xss.sh &
-#Launches chromium in full screen
-huludesktop
-#Once done, stop stop_xss.sh
-killall stop_xss.sh
diff --git a/abs/extra/huludesktop/huludesktop_is.conf b/abs/extra/huludesktop/huludesktop_is.conf
deleted file mode 100644
index 2a83db7..0000000
--- a/abs/extra/huludesktop/huludesktop_is.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--#Hulu-->
-    <button>
-        <type>STREAM</type>
-        <text>Hulu Desktop</text>
-        <description>Open Hulu Desktop</description>
-        <action>EXEC huludesktop.sh</action>
-    </button>
-<!--#Hulu-->
-
diff --git a/abs/extra/intel-gmmlib/PKGBUILD b/abs/extra/intel-gmmlib/PKGBUILD
new file mode 100644
index 0000000..eaa609d
--- /dev/null
+++ b/abs/extra/intel-gmmlib/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Bruno Pagani <archange@archlinux.org>
+# Contributor: Daniel Bermond < yahoo-com: danielbermond >
+
+pkgname=intel-gmmlib
+pkgver=19.1.1
+pkgrel=1
+pkgdesc="Intel Graphics Memory Management Library"
+arch=('x86_64')
+url="https://github.com/intel/gmmlib/"
+license=('MIT')
+depends=('gcc-libs')
+makedepends=('cmake')
+provides=('gmmlib')
+conflicts=('gmmlib')
+replaces=('gmmlib')
+options=('!emptydirs')
+source=("https://github.com/${pkgname/-//}/archive/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('aab4241bde754225a84d71a459f5734c311a6437305ca7e99cd5cbeaab5ff6d5')
+
+prepare() {
+    mkdir -p build
+}
+
+build() {
+    cd build
+    cmake ../${pkgname#*-}-${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DRUN_TEST_SUITE=ON \
+        -Wno-dev
+    make
+}
+
+package() {
+    cd build
+    make DESTDIR="${pkgdir}" install
+    install -Dm644 ../${pkgname#*-}-${pkgname}-${pkgver}/LICENSE.md -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
diff --git a/abs/extra/libva-utils/PKGBUILD b/abs/extra/libva-utils/PKGBUILD
new file mode 100644
index 0000000..61b65dc
--- /dev/null
+++ b/abs/extra/libva-utils/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Bruno Pagani (a.k.a. ArchangeGabriel) <archange@archlinux.org>
+# Contributor: Sean V Kelley <seanvk@posteo.de>
+
+pkgname=libva-utils
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="Intel VA-API Media Applications and Scripts for libva"
+arch=('x86_64')
+url="https://github.com/intel/libva-utils"
+license=('custom')
+depends=('libva')
+makedepends=('mesa')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
+sha256sums=('13d15bf464e5a452f5243a6ca5988d3841c8bbbb017b75d73254acc0e4d6740c')
+
+build() {
+    cd ${pkgname}-${pkgver}
+    ./autogen.sh \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var
+    make
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="$pkgdir" install
+    install -Dm644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD
index 8122125..7ace53b 100644
--- a/abs/extra/plex-media-server/PKGBUILD
+++ b/abs/extra/plex-media-server/PKGBUILD
@@ -1,4 +1,6 @@
-# Maintainer: Tom Moore <t.moore01@gmail.com>
+# Maintainer: Donald Webster <fryfrog@gmail.com>
+# Contributor: Tom Moore <t.moore01@gmail.com>
+# Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Rob Sletten <rsletten@gmail.com>
 # Contributor: monty <linksoft@gmx.de>
@@ -7,42 +9,54 @@
 # Contributor: Praekon <praekon@googlemail.com>
 
 pkgname=plex-media-server
-pkgver=1.14.1.5488
-_pkgsum=cc260c476
-pkgrel=1
+pkgver=1.15.3.876
+_pkgsum=ad6e39743
+pkgrel=2
 pkgdesc='Plex Media Server'
 arch=('x86_64')
 url='https://plex.tv/'
 license=('custom')
-depends=('systemd')
-provides=('plex-media-server')
+options=('!emptydirs')
 conflicts=('plex-media-server-plexpass')
-backup=('etc/conf.d/plexmediaserver')
+# Commented to override user version
+#backup=('etc/conf.d/plexmediaserver')
 install='plex-media-server.install'
 source=('plexmediaserver.conf.d'
         'plexmediaserver.service'
         'plex.sysusers'
+        'plex.tmpfiles'
         'plexmediascanner.sh'
-        'terms.txt'
-        "https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
+        'terms.txt')
+
+#source_aarch64=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/debian/plexmediaserver_${pkgver}-${_pkgsum}_arm64.deb")
+#source_armv7h=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/debian/plexmediaserver_${pkgver}-${_pkgsum}_armhf.deb")
+source_x86_64=("https://downloads.plex.tv/plex-media-server-new/${pkgver}-${_pkgsum}/redhat/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
+
+
+prepare() {
+  if [[ $CARCH = armv7h ]] || [[ $CARCH = aarch64 ]]; then
+    bsdtar -xf data.tar.xz
+  fi
+}
 
 package() {
-  install -dm 755 "${pkgdir}"/{opt,etc/conf.d,usr/lib/systemd/system}
-  cp -dr --no-preserve='ownership' usr/lib/plexmediaserver "${pkgdir}"/opt/
-  install -m 644 plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/
-  install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver
-  install -Dm 644 "$srcdir/plex.sysusers" "$pkgdir/usr/lib/sysusers.d/plex.conf"
+  install -d -m 755 "${pkgdir}/usr/lib/plexmediaserver"
+  cp -dr --no-preserve='ownership' "${srcdir}/usr/lib/plexmediaserver" "${pkgdir}/usr/lib/"
 
-  install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh
+  install -D -m 644 "${srcdir}/plexmediaserver.conf.d" "${pkgdir}/etc/conf.d/plexmediaserver"
+  install -D -m 644 "${srcdir}/plexmediaserver.service" "${pkgdir}/usr/lib/systemd/system/plexmediaserver.service"
+  install -D -m 644 "${srcdir}/plex.sysusers" "${pkgdir}/usr/lib/sysusers.d/plex.conf"
+  install -D -m 644 "${srcdir}/plex.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/plex.conf"
 
-  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -D -m 644 "${srcdir}/terms.txt" "${pkgdir}/usr/share/licenses/${pkgname}/terms.txt"
+  install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh
 }
 
 # vim: ts=2 sw=2 et:
-md5sums=('dfd6778f5c0d3d64c2c3a71dca02b7cc'
-         '3f39ee0e8b1ebb1c7ca714f67fa88641'
-         '97241861f2c0b7c82d1945a6c5de8e35'
-         '506ec15815bba749a743780edd2323c8'
-         'af6d0a81c7821b2eddb1bc137310ca1b'
-         'fafb64a6cc876478964e563af35ea1bd')
+md5sums=('16f212dc586df577fa116d80adf1ebf6'
+         '6920747dc9155847688f9d69b8099168'
+         'd9f76e547b6c31912efa19463af0f3c6'
+         'b926b4b845120bd37b640a4982a667dc'
+         'f70da65876e2caac21dc463df234c726'
+         'af6d0a81c7821b2eddb1bc137310ca1b')
+md5sums_x86_64=('3f957448ed6a22c5fc8c87cc3230d845')
diff --git a/abs/extra/plex-media-server/plex-media-server.install b/abs/extra/plex-media-server/plex-media-server.install
index 96a77a7..e626eda 100644
--- a/abs/extra/plex-media-server/plex-media-server.install
+++ b/abs/extra/plex-media-server/plex-media-server.install
@@ -7,6 +7,7 @@ post_install() {
 }
 
 post_upgrade() {
+  systemd-sysusers plex.conf
   [[ -d /data/storage/disk0/media/plex ]] && chown -R plex:plex /data/storage/disk0/media/plex
 }
 
diff --git a/abs/extra/plex-media-server/plex.sysusers b/abs/extra/plex-media-server/plex.sysusers
index e23680f..848eba4 100644
--- a/abs/extra/plex-media-server/plex.sysusers
+++ b/abs/extra/plex-media-server/plex.sysusers
@@ -1,2 +1 @@
-u plex - "Plex Media Server" /opt/plexmediaserver
-
+u plex - "Plex Media Server" /usr/lib/plexmediaserver
diff --git a/abs/extra/plex-media-server/plex.tmpfiles b/abs/extra/plex-media-server/plex.tmpfiles
new file mode 100644
index 0000000..130fc6f
--- /dev/null
+++ b/abs/extra/plex-media-server/plex.tmpfiles
@@ -0,0 +1 @@
+d /data/storage/disk0/media/plex 0755 plex plex
diff --git a/abs/extra/plex-media-server/plexmediascanner.sh b/abs/extra/plex-media-server/plexmediascanner.sh
index 9ac16c7..6ce2f5d 100755
--- a/abs/extra/plex-media-server/plexmediascanner.sh
+++ b/abs/extra/plex-media-server/plexmediascanner.sh
@@ -3,4 +3,4 @@ exec 2>&1
 export TERM=linux
 . /etc/conf.d/plexmediaserver
 
-sudo -uplex -gplex LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" /opt/plexmediaserver/Plex\ Media\ Scanner $@
+sudo -uplex -gplex LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" /usr/lib/plexmediaserver/Plex\ Media\ Scanner $@
diff --git a/abs/extra/plex-media-server/plexmediaserver.conf.d b/abs/extra/plex-media-server/plexmediaserver.conf.d
index 85ff7a1..253da0b 100644
--- a/abs/extra/plex-media-server/plexmediaserver.conf.d
+++ b/abs/extra/plex-media-server/plexmediaserver.conf.d
@@ -1,5 +1,5 @@
-LD_LIBRARY_PATH=/opt/plexmediaserver
-PLEX_MEDIA_SERVER_HOME=/opt/plexmediaserver
+LD_LIBRARY_PATH=/usr/lib/plexmediaserver/lib
+PLEX_MEDIA_SERVER_HOME=/usr/lib/plexmediaserver
 PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=/data/storage/disk0/media/plex
 PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
 PLEX_MEDIA_SERVER_TMPDIR=/data/storage/disk0/media/plex/tmp
diff --git a/abs/extra/plex-media-server/plexmediaserver.service b/abs/extra/plex-media-server/plexmediaserver.service
index 55b3325..1bcd541 100644
--- a/abs/extra/plex-media-server/plexmediaserver.service
+++ b/abs/extra/plex-media-server/plexmediaserver.service
@@ -3,9 +3,8 @@ Description=Plex Media Server
 After=network.target
 
 [Service]
-WorkingDirectory=/opt/plexmediaserver
 EnvironmentFile=/etc/conf.d/plexmediaserver
-ExecStart=/opt/plexmediaserver/Plex\x20Media\x20Server
+ExecStart=/usr/lib/plexmediaserver/Plex\x20Media\x20Server
 Type=simple
 User=plex
 Group=plex
@@ -13,7 +12,6 @@ Restart=on-failure
 RestartSec=5
 StartLimitInterval=60s
 StartLimitBurst=3
-StandardOutput=null
 
 [Install]
 WantedBy=multi-user.target
diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index 0746933..6512914 100644
--- a/abs/extra/web-on-linhes/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=web-on-linhes
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Added multiple websites with 10' UIs to Play Online Streams."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -22,6 +22,6 @@ package() {
     #add wol-custom-cmds file
     install -D -o1000 -g1000 -m755 ${srcdir}/wol-custom-cmds.sh ${pkgdir}/home/mythtv/.wol-custom-cmds.sh
 }
-md5sums=('f37e208b713ee5b5b3ac54b63597f39f'
-         '7eb75860715a84e7e75b804e159adf35'
+md5sums=('fb0878e348ebc3de11f155ad811fa3c7'
+         'b53251102bb3d075b2307a8991d6f7bb'
          '9f59fabdf944a7381919d4c8407ac21c')
diff --git a/abs/extra/web-on-linhes/web-on-linhes.sh b/abs/extra/web-on-linhes/web-on-linhes.sh
index 3c458dd..bf5c794 100644
--- a/abs/extra/web-on-linhes/web-on-linhes.sh
+++ b/abs/extra/web-on-linhes/web-on-linhes.sh
@@ -6,12 +6,12 @@ irxPID=$!
 #Stops xscreensaver from running.
 stop_xss.sh &
 xssPID=$!
-#Launches chrome in full screen
-(sleep 3; wmctrl -r "Google Chrome" -b add,fullscreen) &
+#Launches chrome in full screen; isn't needed as --start-maximized is working again
+#(sleep 3; wmctrl -r "Google Chrome" -b add,fullscreen) &
 #Launches file to run any custom cmds
 (sleep 4; /home/mythtv/.wol-custom-cmds.sh $@) &
 #Launch chrome
-google-chrome --no-first-run --kiosk $@
+google-chrome --no-first-run --kiosk --start-maximized $@
 #Once done, stops irxevent and stop_xss.sh
 kill $irxPID
 kill $xssPID
diff --git a/abs/extra/web-on-linhes/web-on-linhes_is.conf b/abs/extra/web-on-linhes/web-on-linhes_is.conf
index 2913ec0..5cfa217 100755
--- a/abs/extra/web-on-linhes/web-on-linhes_is.conf
+++ b/abs/extra/web-on-linhes/web-on-linhes_is.conf
@@ -25,22 +25,6 @@
   <!--#WebOnTV-->
      <button>
        <type>STREAM</type>
-       <text>TuneIn</text>
-       <action>EXEC /usr/LH/bin/web-on-linhes.sh http://tv.tunein.com/</action>
-     </button>
-  <!--#WebOnTV-->
-
-  <!--#WebOnTV-->
-     <button>
-       <type>STREAM</type>
-       <text>Vimeo</text>
-       <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.vimeo.com/couchmode</action>
-     </button>
-  <!--#WebOnTV-->
-
-  <!--#WebOnTV-->
-     <button>
-       <type>STREAM</type>
        <text>YouTube</text>
        <action>EXEC /usr/LH/bin/web-on-linhes.sh http://www.youtube.com/tv</action>
      </button>