diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url
index 44c2a7d066..88d519bef9 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/url
+++ b/packages/mediacenter/xbmc-theme-Confluence/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-theme-Confluence-29058.tar.bz2
+http://sources.openelec.tv/svn/xbmc-theme-Confluence-29060.tar.bz2
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 4eb5141083..620b4232f9 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -119,7 +119,7 @@ cd -
             $XBMC_VDPAU \
             $XBMC_VAAPI \
             $XBMC_CRYSTALHD \
-            --disable-internal-ffmpeg \
+            --disable-external-ffmpeg \
             --disable-external-liba52 \
             --disable-external-libdts \
             --disable-external-libass \
diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url
index 66e1196b79..11274fe91c 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-29058.tar.bz2
+http://sources.openelec.tv/svn/xbmc-29060.tar.bz2
diff --git a/projects/ION/options b/projects/ION/options
index f9b58a3791..d0e428679d 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -98,13 +98,8 @@
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
   REMOTE="mceusb"
 
-# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
-# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
-# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER="mceusb"
-
 # Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
-# Space separated list is supported, 
+# Space separated list is supported,
 # e.g. FIRMWARE="iwl3945 iwl5000"
   FIRMWARE=""
 
diff --git a/projects/generic/options b/projects/generic/options
index 57e1be0474..8d641d05e4 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -86,7 +86,7 @@
   VDPAU="yes"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI="no"
+  VAAPI="yes"
 
 # Use Broadcom CrystalHD Decoder Card for video acceleration 
 # (needs Kernelsupport for Broadcom Decoder Card and a supported card)
@@ -98,13 +98,8 @@
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
   REMOTE="mceusb"
 
-# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
-# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
-# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER="mceusb"
-
 # Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
-# Space separated list is supported, 
+# Space separated list is supported,
 # e.g. FIRMWARE="iwl3945 iwl5000"
   FIRMWARE="ipw2100 ipw2200 iwl1000 iwl3945 iwl4965 iwl5000 iwl5150 iwl6000"
 
diff --git a/projects/intel/options b/projects/intel/options
index b235bc9bd9..d32b19de99 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -98,13 +98,8 @@
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
   REMOTE="mceusb"
 
-# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
-# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
-# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER="mceusb"
-
 # Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
-# Space separated list is supported, 
+# Space separated list is supported,
 # e.g. FIRMWARE="iwl3945 iwl5000"
   FIRMWARE="iwl5000"