Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

103 files changed, 585 insertions, 525 deletions

diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index 917d927..60bdfb3 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=42
+pkgrel=44
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/core-testing/linhes-scripts/linhes_update.sh b/abs/core-testing/linhes-scripts/linhes_update.sh
index 39b341e..39d2817 100644
--- a/abs/core-testing/linhes-scripts/linhes_update.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update.sh
@@ -1,11 +1,12 @@
 #!/bin/bash
 dsply ()  {
-	if grep -q Updates\ Available /usr/share/mythtv/linhes.xml
+	if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
 		then
-		killall osd_cat
+		killall -9 osd_cat
 		echo -e "Updates available!\n  Exit and reenter Service Menu\n to perform updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 10 -A centre
 		exit
 		else
+		killall -9 osd_cat
 		echo -e "Checking for updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 300 -A centre &
 	fi
 }
@@ -15,12 +16,12 @@ chck ()  {
 #	sudo grep Target /tmp/check_update > /tmp/to_be_upgraded
 	if grep -q no\ upgrades\ found /tmp/check_update
 		then
-		killall osd_cat
+		killall -9 osd_cat
 		echo -e "No updates available\n at this time." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre
 		else
-		mv /usr/share/mythtv/linhes.xml /tmp/linhes.xml.tmp
-        sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/linhes.xml
-        mv /usr/share/mythtv/linhes.xml /tmp
+		mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
+        sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
+        mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
         grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
   		echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
   		echo "   <button>" >> /tmp/linhes.xml.tmp
@@ -30,7 +31,7 @@ chck ()  {
   		echo "   </button>" >> /tmp/linhes.xml.tmp
   		echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
   		echo "</mythmenu>" >> /tmp/linhes.xml.tmp
-  		mv /tmp/linhes.xml.tmp /usr/share/mythtv/linhes.xml
+  		mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
   		dsply
 	fi
 	}
diff --git a/abs/core-testing/linhes-scripts/linhes_update2.sh b/abs/core-testing/linhes-scripts/linhes_update2.sh
index e6d216d..80945eb 100644
--- a/abs/core-testing/linhes-scripts/linhes_update2.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update2.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
+killall -9 osd_cat
 echo -e "Performing updates." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 300000 -A centre & 
 sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
-if grep -q Check\ for\ updates /usr/share/mythtv/linhes.xml
+if grep -q Check\ for\ updates /usr/share/mythtv/themes/defaultmenu/linhes.xml
 then
 rm -fr /tmp/to_be_upgraded
+killall -9 osd_cat
 echo -e "Update complete." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre
 else
-mv /usr/share/mythtv/linhes.xml /tmp/linhes.xml.tmp
-sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/linhes.xml
-mv /usr/share/mythtv/linhes.xml /tmp
+mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
+sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
+mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
 grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
 echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
 echo "   <button>" >> /tmp/linhes.xml.tmp
@@ -19,7 +21,8 @@ echo "   </button>" >> /tmp/linhes.xml.tmp
 echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
 echo "" >> /tmp/linhes.xml.tmp
 echo "</mythmenu>" >> /tmp/linhes.xml.tmp
-mv /tmp/linhes.xml.tmp /usr/share/mythtv/linhes.xml
+mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
 rm -fr /tmp/to_be_upgraded
+killall -9 osd_cat
 echo -e "Update complete." | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 5 -A centre
 fi
diff --git a/abs/core-testing/linhes-scripts/linhes_update3.sh b/abs/core-testing/linhes-scripts/linhes_update3.sh
index e89f7a3..5dc0b4d 100644
--- a/abs/core-testing/linhes-scripts/linhes_update3.sh
+++ b/abs/core-testing/linhes-scripts/linhes_update3.sh
@@ -10,6 +10,7 @@ if [ $COUNT -lt 20 ]
 fi
 if grep kernel26 /tmp/to_be_upgraded2
 then
+	killall -9 osd_cat
 	echo -e "Please note:\The kernel will be upgraded.\nThis will require a reboot.\nPlease do so when no jobs are running." | osd_cat -p middle -s 5 -f"-adobe-courier-bould-*-*-*-34-*-*-*-*-*" -d 10 -A centre
 else
 	exit
diff --git a/abs/core-testing/mythtv/stable-0.21/linhes-theme/PKGBUILD b/abs/core-testing/linhes-theme/PKGBUILD
index 353fefd..353fefd 100644
--- a/abs/core-testing/mythtv/stable-0.21/linhes-theme/PKGBUILD
+++ b/abs/core-testing/linhes-theme/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/glass-wide/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/glass-wide/PKGBUILD
index 2d0cb11..2d0cb11 100644
--- a/abs/core-testing/mythtv/stable-0.21/glass-wide/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/glass-wide/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/morethemes/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/morethemes/PKGBUILD
index dd05575..dd05575 100644
--- a/abs/core-testing/mythtv/stable-0.21/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/morethemes/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mytharchive/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mytharchive/PKGBUILD
index 4862a1f..4862a1f 100644
--- a/abs/core-testing/mythtv/stable-0.21/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mytharchive/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythbrowser/PKGBUILD
index 51a27d2..51a27d2 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythbrowser/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythcontrols/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythcontrols/PKGBUILD
index 669278c..669278c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythcontrols/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythcontrols/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/PKGBUILD
index aa1feef..aa1feef 100755
--- a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/__changelog b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/__changelog
index c53f2f6..c53f2f6 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/__changelog
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/__changelog
diff --git a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/mc.sql b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mc.sql
index cdb22d4..cdb22d4 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/mc.sql
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mc.sql
diff --git a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/mythdb.install b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mythdb.install
index 4834c69..4834c69 100755
--- a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/mythdb.install
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/mythdb.install
diff --git a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/permissions.sql b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/permissions.sql
index 5a36e15..5a36e15 100755
--- a/abs/core-testing/mythtv/stable-0.21/mythdb-initial/permissions.sql
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythdb-initial/permissions.sql
diff --git a/abs/core-testing/mythtv/stable-0.21/mythflix/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythflix/PKGBUILD
index 5423c06..5423c06 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythflix/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythgallery/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythgallery/PKGBUILD
index bdf7b57..bdf7b57 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythgallery/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythgame/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythgame/PKGBUILD
index aac284a..aac284a 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythgame/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythmovies/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythmovies/PKGBUILD
index c07b3a2..c07b3a2 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythmovies/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythmusic/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/PKGBUILD
index b422f34..b422f34 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythmusic/music_flac.patch b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/music_flac.patch
index b152249..b152249 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythmusic/music_flac.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/music_flac.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythmusic/mythmusic-0.21.patch b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/mythmusic-0.21.patch
index f3fa930..f3fa930 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythmusic/mythmusic-0.21.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythmusic/mythmusic-0.21.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythnews/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythnews/PKGBUILD
index 1f22161..1f22161 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythnews/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythphone/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythphone/PKGBUILD
index 1ce2d5a..1ce2d5a 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythphone/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythphone/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythsmolt/PKGBUILD
index 25c91cf..25c91cf 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythsmolt/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythsmolt/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythstream/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythstream/PKGBUILD
index 275afa8..275afa8 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythstream/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythstream/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythstream/mythstream.diff b/abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.diff
index 477881c..477881c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythstream/mythstream.diff
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.diff
diff --git a/abs/core-testing/mythtv/stable-0.21/mythstream/mythstream.install b/abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.install
index 5af96f2..5af96f2 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythstream/mythstream.install
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythstream/mythstream.install
diff --git a/abs/core-testing/mythtv/stable-0.21/myththemes/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/myththemes/PKGBUILD
index 6c0a0bb..6c0a0bb 100644
--- a/abs/core-testing/mythtv/stable-0.21/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/myththemes/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/2.6.28_dvb_api_version.diff b/abs/core-testing/mythtv/old/stable-0.21/mythtv/2.6.28_dvb_api_version.diff
index 0116023..0116023 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/2.6.28_dvb_api_version.diff
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/2.6.28_dvb_api_version.diff
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythtv/PKGBUILD
index af084fc..af084fc 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/QUICKSTART.archlinux b/abs/core-testing/mythtv/old/stable-0.21/mythtv/QUICKSTART.archlinux
index 310705c..310705c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/QUICKSTART.archlinux
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/QUICKSTART.archlinux
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/gnome_screensaver.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/gnome_screensaver.patch
index 6da37be..6da37be 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/gnome_screensaver.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/gnome_screensaver.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml
index ac52497..ac52497 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/HOST_SETTINGS.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/is.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/is.xml
index 88b7e6b..88b7e6b 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/is.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/is.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/library.xml.patch
index 749e1e7..749e1e7 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/library.xml.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/library.xml.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/linhes.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/linhes.xml
index 80bd3c9..80bd3c9 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/linhes.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/linhes.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mainmenu.xml.patch
index a299325..a299325 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mainmenu.xml.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mythbackup.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythbackup.xml
index 5914b33..5914b33 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mythbackup.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythbackup.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mythrestore.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythrestore.xml
index 8f5c285..8f5c285 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/mythrestore.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/mythrestore.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/optical_menu.xml.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/optical_menu.xml.patch
index d1cb70c..d1cb70c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/optical_menu.xml.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/optical_menu.xml.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/original/create_patch.sh b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/original/create_patch.sh
index 34d8b8c..34d8b8c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/original/create_patch.sh
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/original/create_patch.sh
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/setup.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/setup.xml
index f56bb6f..f56bb6f 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/setup.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/setup.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/siriusmenu.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/siriusmenu.xml
index e317b36..e317b36 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/siriusmenu.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/siriusmenu.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/update.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update.xml
index 5b28833..5b28833 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/update.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/update2.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update2.xml
index 2ab82ea..2ab82ea 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/update2.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/update2.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/util_menu.xml.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/util_menu.xml.patch
index 26ac863..26ac863 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/util_menu.xml.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/util_menu.xml.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/xmmenu.xml b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/xmmenu.xml
index 6b26d11..6b26d11 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/menu-xml/xmmenu.xml
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/menu-xml/xmmenu.xml
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/mpegpspatch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mpegpspatch
index eed08eb..eed08eb 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/mpegpspatch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mpegpspatch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/mythbackend b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend
index 93773a2..93773a2 100755
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/mythbackend
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/mythbackend.lr b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend.lr
index 4f218bc..4f218bc 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/mythbackend.lr
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythbackend.lr
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/mythfrontend.lr b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythfrontend.lr
index 1580533..1580533 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/mythfrontend.lr
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythfrontend.lr
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/myththemedmenu.cpp.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.cpp.patch
index e5c57ef..e5c57ef 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/myththemedmenu.cpp.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.cpp.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/myththemedmenu.h.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.h.patch
index 9744b11..9744b11 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/myththemedmenu.h.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/myththemedmenu.h.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/mythtv.install b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythtv.install
index db1da94..db1da94 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/mythtv.install
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/mythtv.install
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/pretty b/abs/core-testing/mythtv/old/stable-0.21/mythtv/pretty
index e47aaec..e47aaec 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/pretty
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/pretty
diff --git a/abs/core-testing/mythtv/stable-0.21/mythtv/smolt_jump.patch b/abs/core-testing/mythtv/old/stable-0.21/mythtv/smolt_jump.patch
index 696be80..696be80 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythtv/smolt_jump.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythtv/smolt_jump.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythvideo/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/PKGBUILD
index a233549..a233549 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythvideo/mtd b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mtd
index 1f46dfe..1f46dfe 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythvideo/mtd
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mtd
diff --git a/abs/core-testing/mythtv/stable-0.21/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch
index a5a182d..a5a182d 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythvideo/mythvideo.install b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo.install
index a06777d..a06777d 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythvideo/mythvideo.install
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythvideo/mythvideo.install
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweather/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythweather/PKGBUILD
index 201ea5d..201ea5d 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweather/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythweb/PKGBUILD
index 20e9e3d..20e9e3d 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/mythweb.install b/abs/core-testing/mythtv/old/stable-0.21/mythweb/mythweb.install
index a2aa1bd..a2aa1bd 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/mythweb.install
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/mythweb.install
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff
index 103fb2f..103fb2f 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/icons.tar.gz b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/icons.tar.gz
index 691d28e..691d28e 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/icons.tar.gz
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/icons.tar.gz
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/mythweb.pl.diff b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb.pl.diff
index 6dcbf99..6dcbf99 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/mythweb.pl.diff
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb.pl.diff
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/mythweb_gallery_updated1.diff b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb_gallery_updated1.diff
index f683b17..f683b17 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/patch/mythweb_gallery_updated1.diff
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/patch/mythweb_gallery_updated1.diff
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/transcoders.patch b/abs/core-testing/mythtv/old/stable-0.21/mythweb/transcoders.patch
index c1aeb6c..c1aeb6c 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/transcoders.patch
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/transcoders.patch
diff --git a/abs/core-testing/mythtv/stable-0.21/mythweb/wiiweb.tar.bz2 b/abs/core-testing/mythtv/old/stable-0.21/mythweb/wiiweb.tar.bz2
index 200b8c3..200b8c3 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythweb/wiiweb.tar.bz2
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythweb/wiiweb.tar.bz2
diff --git a/abs/core-testing/mythtv/stable-0.21/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/old/stable-0.21/mythzoneminder/PKGBUILD
index 45e0bac..45e0bac 100644
--- a/abs/core-testing/mythtv/stable-0.21/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/old/stable-0.21/mythzoneminder/PKGBUILD
diff --git a/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
index 4f78194..ddee505 100644
--- a/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=morethemes
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Additional themes for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/themes
-_svnver=22957
+_svnver=23069
 _svnmod=themes
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mp_all.sh b/abs/core-testing/mythtv/stable-0.22/mp_all.sh
index 48102eb..b8ef7d9 100755
--- a/abs/core-testing/mythtv/stable-0.22/mp_all.sh
+++ b/abs/core-testing/mythtv/stable-0.22/mp_all.sh
@@ -2,8 +2,8 @@
 
 # for 0.22, we are starting the release numbers at 22000
 # and incrementing from there every time we build
-pkgrel=22000
-_svnver=22957
+pkgrel=22001
+_svnver=23069
 
 # NOTE: Make sure to build and install mythtv first BEFORE building anything else
 buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
diff --git a/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
index 4b45982..a2503eb 100644
--- a/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mytharchive
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
index 75ef1af..1e09758 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythbrowser
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
index 66d676d..555cc3d 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythflix
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Netflix access plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
index b98841a..5058bc9 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgallery
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
index 36e6083..52b2405 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgame
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
index 25047eb..fa2767b 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmovies
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
index 6a0c560..641459c 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmusic
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -16,7 +16,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
index f1883bf..f598a15 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythnews
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
index ea08cc4..c0389ca 100755
--- a/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=myththemes
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/myththemes
-_svnver=22957
+_svnver=23069
 _svnmod=myththemes
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
index 71f7a7c..1de49e8 100755
--- a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
@@ -23,7 +23,7 @@ arch=('i686' 'x86_64')
 #md5sums=()
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythtv
-_svnver=22957
+_svnver=23069
 _svnmod=mythtv
 
 build() {
diff --git a/abs/core-testing/mythtv/stable-0.22/mythtv/mythtv.install b/abs/core-testing/mythtv/stable-0.22/mythtv/mythtv.install
index 87507a5..b6e7bc8 100755
--- a/abs/core-testing/mythtv/stable-0.22/mythtv/mythtv.install
+++ b/abs/core-testing/mythtv/stable-0.22/mythtv/mythtv.install
@@ -16,6 +16,11 @@ post_upgrade() {
 		mkdir -p /var/log/mythv
 		chown -R mythtv /var/log/mythtv
 	fi
+	if [ -e /usr/share/mythtv/is.xml ]
+	then
+		rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml
+		ln -s /usr/share/mythtv/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml
+	fi
 }
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
index eea11d7..3212cd3 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythvideo
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
index 1539157..8b33340 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweather
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
index 6800135..1895129 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
 license="GPL"
@@ -15,7 +15,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 DOCROOT=/data/srv/httpd/htdocs/mythweb
diff --git a/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
index 7459aa9..8ff9936 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythzoneminder
 pkgver=0.22
-pkgrel=22000
+pkgrel=22001
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=22957
+_svnver=23069
 _svnmod=mythplugins
 
 
diff --git a/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD b/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD
new file mode 100644
index 0000000..d6eca0b
--- /dev/null
+++ b/abs/extra-testing/community/flashplugin-prerelease/PKGBUILD
@@ -0,0 +1,28 @@
+# Contributor : Anish Bhatt <anish[removethis][at]gatech[dot]edu>
+
+pkgname=flashplugin-prerelease
+_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf'
+pkgver=10.1.51.66
+pkgrel=1
+source=('http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz'
+	"http://www.adobe.com/products/eulas/pdfs/${_licensefile}")
+md5sums=('4f56f8235cb72a59d04d64ca4bd442b3'
+	'1636037610ee2aa35c5fb736a697b7e0')
+
+pkgdesc='Adobe Flash Player Prerelease'
+url='http://labs.adobe.com/technologies/flashplayer10/'
+arch=('i686')
+depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl')
+conflicts=('flashplugin')
+provides=('flashplayer')
+license=('custom')
+
+build() {
+  install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
+  if [ "${CARCH}" = 'i686' ]; then
+    install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
+  fi
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+}
+
diff --git a/abs/extra-testing/community/xbmc/ChangeLog b/abs/extra-testing/community/xbmc/ChangeLog
deleted file mode 100644
index 59f2370..0000000
--- a/abs/extra-testing/community/xbmc/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.
diff --git a/abs/extra-testing/community/xbmc/PKGBUILD b/abs/extra-testing/community/xbmc/PKGBUILD
deleted file mode 100644
index 950d704..0000000
--- a/abs/extra-testing/community/xbmc/PKGBUILD
+++ /dev/null
@@ -1,118 +0,0 @@
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-
-pkgname=xbmc
-pkgver=8.10
-pkgrel=10
-pkgdesc="XBMC Media Center"
-arch=('i686' 'x86_64')
-url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' \
-         'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' \
-         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' \
-         'tre' 'unzip' 'x-server')
-makedepends=('autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 
-             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip')
-optdepends=('libcdio: optical disc support'
-            'lirc: remote controller support'
-            'pmount: mount removable devices as normal user'
-            'smbclient: access windows shares'
-            'unrar: access compressed files without unpacking them')
-install=("${pkgname}.install")
-source=("http://downloads.sourceforge.net/${pkgname}/XBMC-${pkgver}.src.tar.gz")
-md5sums=('2d20d255a211223eaa47f1c6bcf4be8e')
-
-build() {
-    cd "${srcdir}/XBMC"
-
-    # Remove Mac OS X specific files
-    rm -rf system/python/lib-osx/
-    rm system/players/dvdplayer/*-osx*
-    
-    # Fix permissions for the configure scripts
-    find -type f -name "configure"|xargs chmod a+x || return 1
-    
-    # Fix other permissions
-    find -type f -name "*.pl"|xargs chmod a+x || return 1
-    
-    # Make it gcc 4.3.x compatible
-    sed '92i#include <stdlib.h>' -i guilib/system.h || return 1
-    
-    # Clean up the configure files and make sure they support C++.
-    for file in `find . -type f -name configure.in -or -name configure.ac`; do
-        echo 'AC_PROG_CXX' >> "${file}"
-        sed -e '/AM_PATH_XMMS/ c\echo' \
-	    -e '/AM_PATH_SDL2/ c\echo' \
-	    -i ${file} || return 1
-    done
-    sed -e 's/test_libFLAC++//g' \
-        -i "${srcdir}/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/Makefile.am" || return 1
-
-    # Fix some autoconf issues
-    touch ${srcdir}/XBMC/xbmc/cores/dvdplayer/Codecs/libmad/{NEWS,AUTHORS,ChangeLog} || return 1
-    touch ${srcdir}/XBMC/xbmc/visualizations/Goom/goom2k4-0/ylwrap || return 1
-    touch ${srcdir}/XBMC/xbmc/lib/libid3tag/libid3tag/{NEWS,README,AUTHORS,ChangeLog} || return 1
-    for dir in \
-    	. \
-    	xbmc/cores/dvdplayer/Codecs/libDVDCSS \
-    	xbmc/cores/dvdplayer/Codecs/libdts \
-    	xbmc/cores/dvdplayer/Codecs/libdvdnav \
-    	xbmc/cores/dvdplayer/Codecs/libfaad2 \
-    	xbmc/cores/dvdplayer/Codecs/libmad \
-    	xbmc/cores/dvdplayer/Codecs/libmpeg2 \
-    	xbmc/cores/paplayer/flac-1.2.1 \
-    	xbmc/cores/paplayer/vorbisfile/libvorbis \
-    	xbmc/cores/paplayer/vorbisfile/ogg \
-    	xbmc/visualizations/Goom/goom2k4-0 \
-    	xbmc/lib/libass \
-    	xbmc/lib/libid3tag/libid3tag
-    do
-	autoreconf --install "${srcdir}/XBMC/${dir}" || return 1
-    done
-
-    cd "${srcdir}/XBMC/"
-
-    # Configure XBMC
-    ./configure --prefix=/usr \
-                --disable-debug || return 1
-    
-    # Fix false negative detections of realloc that happens some times
-    if grep -q 'HAVE_REALLOC 0' config.h; then
-      sed -e 's|#define HAVE_REALLOC 0|#define HAVE_REALLOC 1|' \
-          -e 's|#define realloc rpl_realloc|/* #define realloc rpl_realloc */|' \
-          -i config.h || return 1
-    fi
-
-    # XBMCTex will segfault on systems with nvidia instaleld if linked to OpenGL
-    sed -e 's/-lGLU -lGLEW -lGL//' \
-        -i ${srcdir}/XBMC/tools/XBMCTex/Makefile
-
-    # Now (finally) build
-    make || return 1
-    make prefix=${pkgdir}/usr install || return 1
-
-    # Fix the shell script
-    sed -i '4iexport SDL_AUDIODRIVER=alsa' ${pkgdir}/usr/bin/xbmc
-
-    # Xrandr
-    install -Dm755 ${srcdir}/XBMC/xbmc-xrandr \
-                   ${pkgdir}/usr/share/xbmc/xbmc-xrandr || return 1
-
-    # Menu item
-    install -Dm644 ${srcdir}/XBMC/tools/Linux/xbmc.desktop \
-                   ${pkgdir}/usr/share/applications/xbmc.desktop || return 1
-    install -Dm644 ${srcdir}/XBMC/tools/Linux/xbmc.png \
-                   ${pkgdir}/usr/share/pixmaps/xbmc.png || return 1
-
-    # XBMCTex
-    install -Dm755 ${srcdir}/XBMC/tools/XBMCTex/XBMCTex \
-                   ${pkgdir}/usr/share/xbmc/tools/xbmctex || return 1
-
-    # License(s)
-    install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-    for licensef in LICENSE.GPL README.linux copying.txt; do
-        mv ${pkgdir}/usr/share/xbmc/${licensef} \
-           ${pkgdir}/usr/share/licenses/${pkgname} || return 1
-    done
-}
diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD
index 9c12971..31eb4f8 100644
--- a/abs/extra-testing/mythappletrailers/PKGBUILD
+++ b/abs/extra-testing/mythappletrailers/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mythappletrailers
 pkgver=0.04.3
-pkgrel=35
+pkgrel=37
 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml
index dc0c938..ce89fd3 100644
--- a/abs/extra-testing/mythappletrailers/appletrailer.xml
+++ b/abs/extra-testing/mythappletrailers/appletrailer.xml
@@ -7,38 +7,20 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>500 Days of Summer</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/500daysofsummer/500daysofsummer-tlr1_h640w.mov</action>
+		<text>44 Inch Chest</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/44inchchest/44inchchest_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>9</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/9/9-tlr2_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Adam</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/adam/adam-tlra_h640w.mov</action>
+		<text>Across the Hall</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/acrossthehall/acrossthehall-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Alice In Wonderland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tsr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Aliens In the Attic</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/aliensintheattic/aliensintheattic-tlrg_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>All About Steve</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/allaboutsteve/allaboutsteve-tlrc_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/aliceinwonderland/aliceinwonderland-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -49,56 +31,38 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Amelia</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/amelia/amelia-tlra_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Amreeka</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/amreeka/amreeka_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Answer Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/theanswerman/theanswerman_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>Armored</text>
 		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/armored/armored-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Astro Boy</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/astroboy/astroboy-tlr2_h640w.mov</action>
+		<text>Avatar</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/avatar/avatar-tlrf_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Avatar</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/avatar/avatar2009aug0820a-tsr_h640w.mov</action>
+		<text>Babies</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/babies/babies-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Bandslam</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/bandslam/bandslam-tlr1_h640w.mov</action>
+		<text>Bad Lieutenant: Port of Call New Orleans</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/badlieutenant/badlieutenant-tlrr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Beyond a Reasonable Doubt</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/beyondareasonabledoubt/beyondareasonabledoubt_h640w.mov</action>
+		<text>Beastly</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/beastly/beastly-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Big Fan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/bigfan/bigfan_h640w.mov</action>
+		<text>Bitch Slap</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/bitchslap/bitchslap-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -109,26 +73,20 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Blue Tooth Virgin</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thebluetoothvirgin/thebluetoothvirgin_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
 		<text>The Book of Eli</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebookofeli/thebookofeli-tlr1a_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebookofeli/bookofeli-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Box</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thebox/thebox-tlr1a_h640w.mov</action>
+		<text>Broken Embraces</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/brokenembraces/brokenembraces-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Bright Star</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/brightstar/brightstar_h640w.mov</action>
+		<text>Brooklyn’s Finest</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/brooklynsfinest/brooklynsfinest-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -139,50 +97,14 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Burning Plain</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/theburningplain/theburningplain_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Capitalism: a Love Story</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/capitalismalovestory/capitalismalovestory-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Carriers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount_vantage/carriers/carriers-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Casi Divas</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/casidivas/casidivas_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Cloudy With a Chance of Meatballs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/cloudywithachanceofmeatballs/cloudywithachance-tlr3_h640w.mov</action>
+		<text>Clash of the Titans</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/clashofthetitans/clashofthetitans-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Coco Before Chanel</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/cocobeforechanel/cocobeforechanel_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Cold Souls</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/samuel_goldwyn/coldsouls/coldsouls_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Collector</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecollector/thecollector_h640w.mov</action>
+		<text>Cop Out</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/copout/copout-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -193,188 +115,164 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Cove</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecove/thecove_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>The Damned United</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/thedamnedunited/thedamnedunited_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Daybreakers</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>Despicable Me</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/despicableme/despicableme-tlr1_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>District 9</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/district9/district9-tlr4_h640w.mov</action>
+		<text>The Crazies</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thecrazies/thecrazies-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>An Education</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/aneducation/aneducation_h640w.mov</action>
+		<text>Crazy Heart</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/crazyheart/crazyheart-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Extract</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/miramax/extract/extract-inttlr_h640w.mov</action>
+		<text>Crazy On the Outside</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/crazyontheoutside/crazyontheoutside_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Fame</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/mgm/fame/fame-tlr2r_h640w.mov</action>
+		<text>Date Night</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/datenight/datenight-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Fantastic Mr. Fox</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlra_h640w.mov</action>
+		<text>Daybreakers</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/daybreakers/daybreakers-tlr1c_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Final Destination</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/thefinaldestination/thefinaldestination-tlr1_h640w.mov</action>
+		<text>Dear John</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/dearjohn/dearjohn-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Five Minutes of Heaven</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/fiveminutesofheaven/fiveminutesofheaven_h640w.mov</action>
+		<text>Death At a Funeral</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/deathatafuneral/deathatafuneral-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Funny People</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/funnypeople/funnypeople-tlr1r_h640w.mov</action>
+		<text>Despicable Me</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/despicableme/despicableme-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>G-Force</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/gforce/gforce-tlr2_h640w.mov</action>
+		<text>Did You Hear About the Morgans?</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/didyouhearaboutthemorgans/didyouhearaboutthemorgans-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>G.I. Joe: Rise of Cobra</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/gijoe/gijoetheriseofcobra-tlr1_h640w.mov</action>
+		<text>District 13: Ultimatum</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/district13ultimatum/district13-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Gamer</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/gamer/gamer-tlr2a_h640w.mov</action>
+		<text>Everybody’s Fine</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/miramax/everybodysfine/everybodysfine-tlr1r2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Gentlemen Broncos</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/gentlemenbroncos/gentlemenbroncos_h640w.mov</action>
+		<text>Extraordinary Measures</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/extraordinarymeasures/extraordinarymeasures-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Grace</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/grace/grace_h640w.mov</action>
+		<text>Fantastic Mr. Fox</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/fantasticmrfox/fantasticmrfox-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Halloween 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/halloween2/halloweenii-tlr2_h640w.mov</action>
+		<text>Frozen</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/frozen/frozen-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Hangover</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/thehangover/thehangover-tlr2_h640w.mov</action>
+		<text>Furry Vengeance</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/furryvengeance/furryvengeance-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Hurt Locker</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/thehurtlocker/thehurtlocker_h640w.mov</action>
+		<text>Green Zone</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/greenzone/greenzone-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>I Can Do Bad All by Myself</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/icandobadallbymyself/icandobadallbymyself-tlr2a_h640w.mov</action>
+		<text>Greenberg</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/greenberg/greenberg-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>I Sell the Dead</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/isellthedead/isellthedead_h640w.mov</action>
+		<text>Grown Ups</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/grownups/grownups-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Ice Age: Dawn of the Dinosaurs</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/ice_age_iii/iceage3-tlrn_h640w.mov</action>
+		<text>Hot Tub Time Machine</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/mgm/hottubtimemachine/hottubtimemachine-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>In the Loop</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/intheloop/intheloop_h640w.mov</action>
+		<text>How To Train Your Dragon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount_classics/howtotrainyourdragon/howtotrainyourdragon-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Informant!</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theinformant/theinformant-tlr1_h640w.mov</action>
+		<text>The Imaginarium of Doctor Parnassus</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/theimaginariumofdoctorparnassus/imaginariumofdrparnassus-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Inglourious Basterds</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/inglouriousbasterds/inglouriousbasterds-tlr4_h640w.mov</action>
+		<text>Inception</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/inception/inception-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Invention of Lying</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/theinventionoflying/theinventionoflying-tlr1_h640w.mov</action>
+		<text>Invictus</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/invictus/invictus-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>It Might Get Loud</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/itmightgetloud/itmightgetloud_h640w.mov</action>
+		<text>Iron Man 2</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/ironman2/ironman2-z7r459g-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>It’s Complicated</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/itscomplicated/itscomplicated_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/itscomplicated/itscomplicated-tlr2r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Jennifer’s Body</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/jennifersbody/jennifersbody-tlrc_h640w.mov</action>
+		<text>Kick Ass</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/kickass/kickass-tlr1a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Julie  Julia</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/julieandjulia/julieandjulia-tlr1_h640w.mov</action>
+		<text>Knight and Day</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/knightandday/knightanday-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -385,32 +283,32 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Law Abiding Citizen</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
+		<text>The Last Station</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thelaststation/thelaststation-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Legion</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
+		<text>Law Abiding Citizen</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/lawabidingcitizen/lawabidingcitizen_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Live Music</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/livemusic/livemusic_h640w.mov</action>
+		<text>Leap Year</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/leapyear/leapyear-tlr1b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Lorna’s Silence</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/lornassilence/lornassilence_h640w.mov</action>
+		<text>Legion</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/legion/legion-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Love Happens</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/lovehappens/lovehappens-tlr1_h640w.mov</action>
+		<text>Letters To Juliet</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/letterstojuliet/letterstojuliet-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
@@ -421,38 +319,26 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Men Who Stare At Goats</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/overture/themenwhostareatgoats/themenwhostareatgoats_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>More Than a Game</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/morethanagame/morethanagame-tlr1a_h640w.mov</action>
-	</button>
-
-	<button>
-		<type>VIDEO_BROWSER</type>
-		<text>My One and Only</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/myoneandonly/myoneandonly_h640w.mov</action>
+		<text>Me and Orson Welles</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/meandorsonwelles/meandorsonwelles-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>New York, I Love You</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/newyorkiloveyou/newyorkiloveyou_h640w.mov</action>
+		<text>The Men Who Stare At Goats</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/overture/themenwhostareatgoats/themenwhostareatgoats_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Night At the Museum: Battle of the Smithsonian</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/nightatthemuseum2/nightatthemuseum2-tlro_h640w.mov</action>
+		<text>A Nightmare On Elm Street</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/anightmareonelmstreet/nightmareonelmstreet-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
 		<text>Nine</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/nine/nine-tlr1_h640w.mov</action>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/nine/nine-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
@@ -475,248 +361,248 @@
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Ong Bak 2</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/ongbak2/ongbak2_h640w.mov</action>
+		<text>Percy Jackson  the Olympians: Lightning Thief</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/lightningthief/percyjackson-tlrf_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Orphan</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/orphan/orphan-tlr2_h640w.mov</action>
+		<text>Planet 51</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Other Man</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theotherman/theotherman_h640w.mov</action>
+		<text>Precious</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Pandorum</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/pandorum/pandorum-tl1_h640w.mov</action>
+		<text>Prince of Persia: the Sands of Time</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princeofpersia/princeofpersia-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Paper Heart</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/paperheart/paperheart_h640w.mov</action>
+		<text>Princess and the Frog</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Paris</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/ifc_films/paris/paris_h640w.mov</action>
+		<text>The Private Lives of Pippa Lee</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theprivatelivesofpippalee/privatelivesofpippalee-tlr1b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>A Perfect Getaway</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/aperfectgetaway/aperfectgetaway_h640w.mov</action>
+		<text>A Prophet (Un Prophete)</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony/aprophet/aprophet-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Planet 51</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/planet51/planet51-tlr2_h640w.mov</action>
+		<text>Red Cliff</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/redcliff/redcliff-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Play the Game</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/playthegame/playthegame_h640w.mov</action>
+		<text>Remember Me</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/rememberme/rememberme-tlrl_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Ponyo</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/ponyo/ponyo_h640w.mov</action>
+		<text>The Road</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Post Grad</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/postgrad/postgrad-tlra_h640w.mov</action>
+		<text>Robin Hood</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/robinhood/robinhood-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Precious</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/precious/precious-tlr2a_h640w.mov</action>
+		<text>Saint John of Las Vegas</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/saintjohnoflasvegas/saintjohnoflasvegas-tlr1b_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Princess and the Frog</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/princessandthefrog/princessandthefrog-tsr2_h640w.mov</action>
+		<text>Salt</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/salt/salt-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Proposal</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/theproposal/theproposal-tlr3_h640w.mov</action>
+		<text>Serious Moonlight</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/seriousmoonlight/seriousmoonlight-tlr1r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Road</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/theroad/theroad_h640w.mov</action>
+		<text>Sex and the City 2</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/sexandthecity2/sexandthecity2-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Saw VI</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/saw6/sawvi_h640w.mov</action>
+		<text>Sherlock Holmes</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The September Issue</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theseptemberissue/theseptemberissue_h640w.mov</action>
+		<text>Shrek Forever After</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/dreamworks/shrekforeverafter/shrek4_tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Sherlock Holmes</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/sherlockholmes/sherlockholmes-tlr2_h640w.mov</action>
+		<text>Shutter Island</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2r_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Shorts</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/shorts/shorts-tlr3_h640w.mov</action>
+		<text>A Single Man</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/weinstein/asingleman/asingleman-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Shrink</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/shrink/shrink-tlr1_h640w.mov</action>
+		<text>The Slammin’ Salmon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theslamminsalmon/slamminsalmon-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Shutter Island</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/shutterisland/shutterisland-tlr1r2_h640w.mov</action>
+		<text>The Sorcerer’s Apprentice</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/thesorcerersapprentice/sorcerersapprentice-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Sorority Row</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/sororityrow/sororityrow-tlr1_h640w.mov</action>
+		<text>Spy Next Door</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/spynextdoor/spynextdoor-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Spread</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/spread/spread_h640w.mov</action>
+		<text>The Strip</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/thestrip/thestrip-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>St. Trinian’s</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/sttrinians/sttrinians_h640w.mov</action>
+		<text>Takers</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/takers/takers-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Stepfather</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thestepfather/thestepfather_h640w.mov</action>
+		<text>To Save a Life</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/tosavealife/tosavealife-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Surrogates</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/surrogates/surrogates-tlr2_h640w.mov</action>
+		<text>The Tooth Fairy</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox/thetoothfairy/toothfairy-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Surviving Crooked Lake</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/survivingcrookedlake/survivingcrookedlake_h640w.mov</action>
+		<text>Toy Story 3</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/toystory3/toystory3-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Taking Woodstock</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/focus_features/takingwoodstock/takingwoodstock-tlr_h640w.mov</action>
+		<text>Transylmania</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/transylmania/transylmania_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Time Traveler’s Wife</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/timetravelerswife/timetravelerswife-tlr1_h640w.mov</action>
+		<text>The Twilight Saga: New Moon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/newmoon/newmoon-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Toy Story 3</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/toystory3/toystory3-tsr_h640w.mov</action>
+		<text>Tyler Perry’s Why Did I Get Married Too</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/lionsgate/whydidigetmarriedtoo/whydidigetmarriedtoo-tlr_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Transformers: Revenge of the Fallen</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr2r_h640w.mov</action>
+		<text>Up In the Air</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/paramount/upintheair/upintheair-tlr3_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Twilight Saga: New Moon</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/summit/newmoon/newmoon-tsr1_h640w.mov</action>
+		<text>Valentine’s Day</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/newline/valentinesday/valentinesday-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>The Ugly Truth</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/theuglytruth/theuglytruth-tlr2_h640w.mov</action>
+		<text>Warlords</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/warlords/warlords-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Walt  El Grupo</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/waltandelgrupo/waltandelgrupo_h640w.mov</action>
+		<text>When In Rome</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/touchstone/wheninrome/wheninrome-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Where the Wild Things Are</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/wherethewildthingsare/wtwta-tlr2_h640w.mov</action>
+		<text>The White Ribbon</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/thewhiteribbon/whiteribbon-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Whip It</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/fox_searchlight/whipit/whipit_h640w.mov</action>
+		<text>The Wolfman</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/universal/thewolfman/wolfman-tlr2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>White On Rice</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/whiteonrice/whiteonrice_h640w.mov</action>
+		<text>Wonderful World</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/wonderfulworld/wonderfulworld-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Whiteout</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/wb/whiteout/whiteout-tlr1_h640w.mov</action>
+		<text>The Yellow Handkerchief</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theyellowhandkerchief/yellowhandkerchief-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>World’s Greatest Dad</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/magnolia_pictures/worldsgreatestdad/worldsgreatestdad_h640w.mov</action>
+		<text>Yesterday Was a Lie</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/yesterdaywasalie/yesterdaywasalie-trla2_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>X Games 3D: the Movie</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/disney/xgames3d/xgames3d_h640w.mov</action>
+		<text>The Young Victoria</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/theyoungvictoria/youngvictoria-tlr1_h640w.mov</action>
 	</button>
 
 	<button>
 		<type>VIDEO_BROWSER</type>
-		<text>Zombieland</text>
-		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/sony_pictures/zombieland/zombieland-tlr1_h640w.mov</action>
+		<text>Youth In Revolt</text>
+		<action>EXEC loading.sh &amp;&amp; mplayer-wrapper.pl -fs -zoom -really-quiet -user-agent "QuickTime/7.6.2" -cache 16000 http://apple.com/movies/independent/youthinrevolt/youthinrevolt-tlr2_h640w.mov</action>
 	</button>
 
 </mythmenu>
diff --git a/abs/extra-testing/mythappletrailers/mythappletrailers.install b/abs/extra-testing/mythappletrailers/mythappletrailers.install
index 0f6d8fa..3937d09 100644
--- a/abs/extra-testing/mythappletrailers/mythappletrailers.install
+++ b/abs/extra-testing/mythappletrailers/mythappletrailers.install
@@ -1,6 +1,6 @@
 # arg 1:  the new package version
 post_install() {
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml
+  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml
   mv /usr/share/mythtv/is.xml /tmp
   grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
   echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp
@@ -17,17 +17,17 @@ post_install() {
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ -e /usr/share/mythtv/appletrailer.xml ]
+  if [ -e /usr/share/mythtv/themes/defaultmenu/appletrailer.xml ]
   then
   	exit
   else	
-  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml
+  ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml
   fi
 }
 
 # arg 1:  the old package version
 post_remove() {
-	rm -fr /usr/share/mythtv/appletrailer.xml
+	rm -fr /usr/share/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaulmenu/mythappletrailer.xml
 	mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
 	sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
 }
diff --git a/abs/extra-testing/community/xbmc-svn/CHANGELOG b/abs/extra-testing/xbmc-svn/CHANGELOG
index ddcbd53..ddcbd53 100644
--- a/abs/extra-testing/community/xbmc-svn/CHANGELOG
+++ b/abs/extra-testing/xbmc-svn/CHANGELOG
diff --git a/abs/extra-testing/community/xbmc-svn/Lircmap.xml b/abs/extra-testing/xbmc-svn/Lircmap.xml
index 600567f..600567f 100644
--- a/abs/extra-testing/community/xbmc-svn/Lircmap.xml
+++ b/abs/extra-testing/xbmc-svn/Lircmap.xml
diff --git a/abs/extra-testing/community/xbmc-svn/PKGBUILD b/abs/extra-testing/xbmc-svn/PKGBUILD
index 46647a3..d7debbe 100644
--- a/abs/extra-testing/community/xbmc-svn/PKGBUILD
+++ b/abs/extra-testing/xbmc-svn/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=25089
 pkgrel=1
 pkgdesc="XBMC Media Center from SVN"
 provides=('xbmc')
-conflicts=('xbmc' 'xbmc-smoothvideo' 'xbmc-vdpau')
+conflicts=('xbmc')
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'LGPL')
diff --git a/abs/extra-testing/community/xbmc-svn/__changelog b/abs/extra-testing/xbmc-svn/__changelog
index bbf1705..bbf1705 100644
--- a/abs/extra-testing/community/xbmc-svn/__changelog
+++ b/abs/extra-testing/xbmc-svn/__changelog
diff --git a/abs/extra-testing/community/xbmc-svn/xbmc-svn.install b/abs/extra-testing/xbmc-svn/xbmc-svn.install
index acf409c..acf409c 100644
--- a/abs/extra-testing/community/xbmc-svn/xbmc-svn.install
+++ b/abs/extra-testing/xbmc-svn/xbmc-svn.install
diff --git a/abs/extra-testing/xbmc/Lircmap.xml b/abs/extra-testing/xbmc/Lircmap.xml
new file mode 100644
index 0000000..600567f
--- /dev/null
+++ b/abs/extra-testing/xbmc/Lircmap.xml
@@ -0,0 +1,233 @@
+<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
+<!--                                                                              -->
+<!-- How to add remotes                                                           -->
+<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
+<!--                                                                              -->
+<!-- For the commands the layout following layout is used                         -->
+<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
+<!--                                                                              -->
+<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
+
+<lircmap>
+	<remote device="mceusb">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="mceusb2">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="XboxDVDDongle">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="Microsoft_Xbox">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="PinnacleSysPCTVRemote">
+		<play>Play</play>
+		<pause>pause</pause>
+		<stop>Stop</stop>
+		<forward>FForward</forward>
+		<reverse>Rewind</reverse>
+		<left>Vol-Rew</left>
+		<right>Vol+FF</right>
+		<up>Chan+Play</up>
+		<down>Chan-Stop</down>
+		<pageplus>channel+</pageplus>
+		<pageminus>channel-</pageminus>
+		<select>middle</select>
+		<back>undo</back>
+		<menu>Menu</menu>
+		<title>L</title>
+		<info>Info</info>
+		<skipplus>next</skipplus>
+		<display>Fullscreen</display>
+		<record>Record</record>
+		<volumeplus>vol+</volumeplus>
+		<volumeminus>vol-</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+        <remote device="Streamzap_PC_Remote">
+                <play>PLAY</play>
+                <pause>PAUSE</pause>
+                <stop>STOP</stop>
+                <forward>&gt;&gt;</forward>
+                <reverse>&lt;&lt;</reverse>
+                <left>LEFT</left>
+                <right>RIGHT</right>
+                <up>UP</up>
+                <down>DOWN</down>
+                <pageplus>CH_UP</pageplus>
+                <pageminus>CH_DOWN</pageminus>
+                <select>OK</select>
+                <back>EXIT</back>
+                <menu>MENU</menu>
+                <title>RED</title>
+                <info>GREEN</info>
+                <skipplus>&gt;&gt;|</skipplus>
+                <display>YELLOW</display>
+                <record>RECORD</record>
+                <volumeplus>VOL_UP</volumeplus>
+                <volumeminus>VOL_DOWN</volumeminus>
+                <mute>MUTE</mute>
+                <power>POWER</power>
+                <one>1</one>
+                <two>2</two>
+                <three>3</three>
+                <four>4</four>
+                <five>5</five>
+                <six>6</six>
+                <seven>7</seven>
+                <eight>8</eight>
+                <nine>9</nine>
+                <zero>0</zero>
+        </remote>
+</lircmap>
diff --git a/abs/extra-testing/xbmc/PKGBUILD b/abs/extra-testing/xbmc/PKGBUILD
new file mode 100644
index 0000000..81755b3
--- /dev/null
+++ b/abs/extra-testing/xbmc/PKGBUILD
@@ -0,0 +1,86 @@
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+
+pkgname=xbmc
+pkgver=9.11
+pkgrel=2
+pkgdesc="XBMC Media Center"
+arch=('i686' 'x86_64')
+url="http://xbmc.org"
+license=('GPL' 'custom')
+conflicts=('xbmc-svn')
+depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew'
+         'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient'
+         'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3'
+         'tre' 'unzip' 'x-server' 'libcdio' 'wavpack' 'libmpeg2' 'a52dec'
+         'smbclient' 'faad2' 'libsamplerate' 'libmms' 'xorg-utils')
+makedepends=('autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf'
+	     'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip'
+	     'libvdpau')
+optdepends=('libcdio: optical disc support'
+            'lirc: remote controller support'
+            'pmount: mount removable devices as normal user'
+            'smbclient: access windows shares'
+            'unrar: access compressed files without unpacking them')
+install=("${pkgname}.install")
+options=(force)
+source=("http://downloads.sourceforge.net/project/xbmc/XBMC%20Source%20Code/Camelot%20-%20$pkgver/xbmc-${pkgver/_/-}.tar.gz" \
+	'Lircmap.xml')
+md5sums=('9a68ac1e2f44a54cc3803fcdb1265767')
+
+build() {
+    cd "${srcdir}/xbmc-${pkgver/_/-}"
+    _xbmcprefix=/opt/xbmc
+
+    if [ $NOEXTRACT -ne 1 ]; then
+#    if true; then
+    ./bootstrap
+    ./configure --prefix=${_xbmcprefix} \
+                --enable-vdpau \
+                --disable-pulse \
+                --disable-avahi \
+                --enable-external-liba52 \
+                --enable-external-libdts \
+                --enable-external-libmpeg2 \
+                --enable-external-libogg \
+                --enable-external-libwavpack \
+                --disable-external-libass \
+                --disable-external-ffmpeg \
+                --disable-external-python \
+                --disable-debug || return 1
+    fi
+
+    make || return 1
+    make prefix=${pkgdir}${_xbmcprefix} install || return 1
+
+    # Fix the shell script
+    sed -i '3iexport SDL_AUDIODRIVER=alsa' ${pkgdir}${_xbmcprefix}/bin/xbmc
+
+    # Menu item
+    install -Dm644 ${srcdir}/xbmc-${pkgver/_/-}/tools/Linux/xbmc.desktop \
+                   ${pkgdir}/usr/share/applications/xbmc.desktop || return 1
+    install -Dm644 ${srcdir}/xbmc-${pkgver/_/-}/tools/Linux/xbmc.png \
+                   ${pkgdir}/usr/share/pixmaps/xbmc.png || return 1
+
+    # XBMCTex
+#    install -Dm755 ${srcdir}/xbmc-${pkgver/_/-}/tools/XBMCTex/XBMCTex \
+#                   ${pkgdir}${_xbmcprefix}/share/xbmc/tools/xbmctex || return 1
+
+    # License(s)
+    install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
+    for licensef in LICENSE.GPL README.linux copying.txt; do
+        mv ${pkgdir}${_xbmcprefix}/share/xbmc/${licensef} \
+           ${pkgdir}/usr/share/licenses/${pkgname} || return 1
+    done
+
+    # profile.d
+    mkdir -p $pkgdir/etc/profile.d/ && \
+    echo "export PATH=\$PATH:${_xbmcprefix}/bin" >$pkgdir/etc/profile.d/xbmc.sh && \
+    chmod 0755 $pkgdir/etc/profile.d/xbmc.sh || return 1
+
+    # fix .desktop
+    sed -i 's#Exec=xbmc#Exec=/opt/xbmc/bin/xbmc#' $pkgdir/opt/xbmc/share/xsessions/XBMC.desktop $pkgdir/usr/share/applications/xbmc.desktop
+
+    # Use custom Lircmap to support StreamZap remote
+    cp ${srcdir}/Lircmap.xml ${pkgdir}${_xbmcprefix}/share/xbmc/system/Lircmap.xml
+}
diff --git a/abs/extra-testing/xbmc/__changelog b/abs/extra-testing/xbmc/__changelog
new file mode 100644
index 0000000..bbf1705
--- /dev/null
+++ b/abs/extra-testing/xbmc/__changelog
@@ -0,0 +1 @@
+Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes
diff --git a/abs/extra-testing/community/xbmc/xbmc.install b/abs/extra-testing/xbmc/xbmc.install
index 9316bc8..eb4e9d4 100644
--- a/abs/extra-testing/community/xbmc/xbmc.install
+++ b/abs/extra-testing/xbmc/xbmc.install
@@ -5,5 +5,3 @@ post_install() {
   echo ">> of 16."
   /bin/true
 }
-
-# vim:set ts=2 sw=2 et: