diff --git a/packages/multimedia/gst-plugins-good/build b/packages/multimedia/gst-plugins-good/build
index 587e822694..bc72181dac 100755
--- a/packages/multimedia/gst-plugins-good/build
+++ b/packages/multimedia/gst-plugins-good/build
@@ -18,15 +18,12 @@ $SCRIPTS/build libv4l
 $SCRIPTS/build speex
 $SCRIPTS/build libshout
 $SCRIPTS/build libiec61883
-$SCRIPTS/build cairo
+$SCRIPTS/build $CAIRO
 $SCRIPTS/build gtk+
 $SCRIPTS/build bzip2
 $SCRIPTS/build zlib
 $SCRIPTS/build jpeg
 $SCRIPTS/build libpng
-#$SCRIPTS/build libX11
-
-
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
diff --git a/packages/multimedia/gst-plugins-good/install b/packages/multimedia/gst-plugins-good/install
index 759c1cf119..b6dd8cbb55 100755
--- a/packages/multimedia/gst-plugins-good/install
+++ b/packages/multimedia/gst-plugins-good/install
@@ -5,12 +5,11 @@
 $SCRIPTS/install gstreamer
 $SCRIPTS/install gst-plugins-base
 #$SCRIPTS/install libdv
-$SCRIPTS/install cairo
+$SCRIPTS/install $CAIRO
 $SCRIPTS/install gtk+
 $SCRIPTS/install zlib
 $SCRIPTS/install jpeg
 $SCRIPTS/install libpng
-#$SCRIPTS/install libX11
 $SCRIPTS/install libsoup
 
 mkdir -p $INSTALL/usr/lib/gstreamer-0.10
diff --git a/packages/multimedia/pigment/build b/packages/multimedia/pigment/build
index c87ab006f7..dfbeb995a7 100755
--- a/packages/multimedia/pigment/build
+++ b/packages/multimedia/pigment/build
@@ -5,11 +5,10 @@
 $SCRIPTS/build toolchain
 $SCRIPTS/build $MESA
 $SCRIPTS/build pango
-$SCRIPTS/build cairo
+$SCRIPTS/build $CAIRO
 $SCRIPTS/build gstreamer
 $SCRIPTS/build gst-plugins-base
 $SCRIPTS/build libX11
-#$SCRIPTS/build libXcomposite
 $SCRIPTS/build glib
 $SCRIPTS/build gtk+
 
diff --git a/packages/multimedia/pigment/install b/packages/multimedia/pigment/install
index 48e69f6de7..3014d2a957 100755
--- a/packages/multimedia/pigment/install
+++ b/packages/multimedia/pigment/install
@@ -4,15 +4,10 @@
 
 $SCRIPTS/install $MESA
 $SCRIPTS/install pango
-$SCRIPTS/install cairo
+$SCRIPTS/install $CAIRO
 $SCRIPTS/install gstreamer
 $SCRIPTS/install gst-plugins-base
-#$SCRIPTS/install gst-plugins-good
-#$SCRIPTS/install gst-plugins-ugly
-#$SCRIPTS/install gst-plugins-bad
-#$SCRIPTS/install gst-ffmpeg
 $SCRIPTS/install libX11
-#$SCRIPTS/install libXcomposite
 $SCRIPTS/install glib
 $SCRIPTS/install gtk+
 
diff --git a/packages/x11-toolkits/gtk+/build b/packages/x11-toolkits/gtk+/build
index 19d8b5452f..b70725c1b2 100755
--- a/packages/x11-toolkits/gtk+/build
+++ b/packages/x11-toolkits/gtk+/build
@@ -11,7 +11,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXrandr
 $SCRIPTS/build glib
 $SCRIPTS/build pango
-$SCRIPTS/build cairo
+$SCRIPTS/build $CAIRO
 
 cd $PKG_BUILD
 ac_cv_func_posix_getpwuid_r=yes \
diff --git a/packages/x11-toolkits/gtk+/install b/packages/x11-toolkits/gtk+/install
index d277812444..c30a3a5f4b 100755
--- a/packages/x11-toolkits/gtk+/install
+++ b/packages/x11-toolkits/gtk+/install
@@ -10,7 +10,7 @@ $SCRIPTS/install libX11
 $SCRIPTS/install libXrandr
 $SCRIPTS/install glib
 $SCRIPTS/install pango
-$SCRIPTS/install cairo
+$SCRIPTS/install $CAIRO
 
 GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
 GTK_LIB_DIR="gtk-2.0/$GTK_BINARY_VERSION"
@@ -45,4 +45,4 @@ cp -PR $PKG_BUILD/modules/input/im-multipress.conf \
 
 mkdir -p $INSTALL/usr/bin
 cp -PR $PKG_BUILD/gtk/.libs/gtk-query-immodules-2.0 $INSTALL/usr/bin
-cp -PR $PKG_BUILD/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $INSTALL/usr/bin
\ No newline at end of file
+cp -PR $PKG_BUILD/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $INSTALL/usr/bin
diff --git a/packages/x11-toolkits/pango/build b/packages/x11-toolkits/pango/build
index d950b1552c..af2cba1c21 100755
--- a/packages/x11-toolkits/pango/build
+++ b/packages/x11-toolkits/pango/build
@@ -4,7 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build glib
-$SCRIPTS/build cairo
+$SCRIPTS/build $CAIRO
 $SCRIPTS/build freetype
 $SCRIPTS/build fontconfig
 $SCRIPTS/build libX11
diff --git a/packages/x11-toolkits/pango/install b/packages/x11-toolkits/pango/install
index 100501417c..d76ce6d6ef 100755
--- a/packages/x11-toolkits/pango/install
+++ b/packages/x11-toolkits/pango/install
@@ -3,7 +3,7 @@
 . config/options
 
 $SCRIPTS/install glib
-$SCRIPTS/install cairo
+$SCRIPTS/install $CAIRO
 $SCRIPTS/install freetype
 $SCRIPTS/install fontconfig
 $SCRIPTS/install libX11
diff --git a/projects/intel/options b/projects/intel/options
index 1dca61aaf6..f602e606e0 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -1,5 +1,5 @@
-# Mediacenter to use (moovida, entertainer)
-MEDIACENTER=moovida
+# Mediacenter to use (moovida, mythtv)
+MEDIACENTER=mythtv
 
 GAMES=yes
 EMULATORS=yes
@@ -8,8 +8,11 @@ EMULATORS=yes
 # radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
 # Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
 XORG_DRIVERS="intel"
+
 # eg.: i915, i965
 DRIDRIVERS="i965"
 
 MESA=Mesa-master
 LIBDRM=libdrm
+CAIRO=cairo-master
+DISPLAY=eagle
\ No newline at end of file