diff --git a/config/issue b/config/issue
index 3874d1170..f072d5948 100644
--- a/config/issue
+++ b/config/issue
@@ -1 +1 @@
-Welcome to GeeXboX
+Welcome to OpenELEC - the powerfull Mediacenter4you
diff --git a/config/options b/config/options
index e335e71cb..011baa0d1 100644
--- a/config/options
+++ b/config/options
@@ -96,14 +96,10 @@ REMOTE=atiusb
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
 RECEIVER=atiusb
 
-# Use Extra Binary Codecs - RealMedia/WindowsMedia 9 (yes/no)
-EXTRACODECS=no
 
 # Use Extra Binary Firmwares - WiFi/DVB cards (yes/no)
 EXTRAFIRMWARES=no
 
-# Use Extra Non-Free Fonts, required for Asian Font Support (yes/no)
-EXTRAFONTS=no
 
 # Network Support (Samba shares and FTP Server) (yes/no)
 NETWORK=yes
@@ -123,58 +119,13 @@ NDISWRAPPER=no
 # Allow use of WPA_Supplicant for WPA-PSK secured wireless networks (yes/no)
 WPA_SUPPLICANT=yes
 
-# enable olsr protocol (yes/no)
-OLSR=no
 
-# Auto-discovery of UPnP MediaServer devices (yes/no)
-UPNP=yes
-
-# Add DXR3/Hollywood+ support (EXPERIMENTAL)
-DXR3=no
-
-# Add LIVE555 support (requires glibc and forces c++ support)
-LIVE555=no
-
-# Support for Python (yes/no)
-PYTHON=yes
-
-# Support for Pygame (yes/no)
-PYGAME=yes
-
-# Support for SDL library (yes/no)
-SDL=yes
-
-# Support for regular console mode (a.k.a. SD mode) (yes/no)
-CONSOLE=yes
-
-# Support for X.org server (a.k.a. HD mode) (yes/no)
-XORG=yes
 
 # X.org drivers to use (all/ati/geode/glint/i740/intel/mga/nv/openchrome/
 # radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
 # Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
 XORG_DRIVERS="ati nv vesa openchrome"
 
-# Include nVidia proprietary X.Org video driver
-NVIDIA=no
-
-# Default boot method (geexbox/hdtv/install/debug/hdtvdebug)
-BOOT_DEFAULT=
-
-# Support for emulators (yes/no)
-EMULATORS=yes
-
-# Support for games (yes/no)
-GAMES=yes
-
-# Image viewer / dia show support (yes/no)
-VIEW_IMG=no
-
-# Allow addition of digimatrix-only support tools (yes/no)
-DIGIMATRIX=no
-
-# Default timeout in seconds for dia show (0 to disable)
-VIEW_IMG_TIMEOUT=10
 
 # LCD display support (yes/no)
 LCD4LINUX=yes
diff --git a/packages/x11/proto/bigreqsproto/build b/packages/x11/proto/bigreqsproto/build
index 6d982be52..46b932679 100755
--- a/packages/x11/proto/bigreqsproto/build
+++ b/packages/x11/proto/bigreqsproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/compositeproto/build b/packages/x11/proto/compositeproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/compositeproto/build
+++ b/packages/x11/proto/compositeproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/damageproto/build b/packages/x11/proto/damageproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/damageproto/build
+++ b/packages/x11/proto/damageproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/fixesproto/build b/packages/x11/proto/fixesproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/fixesproto/build
+++ b/packages/x11/proto/fixesproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/fontcacheproto/build b/packages/x11/proto/fontcacheproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/fontcacheproto/build
+++ b/packages/x11/proto/fontcacheproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/fontsproto/build b/packages/x11/proto/fontsproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/fontsproto/build
+++ b/packages/x11/proto/fontsproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/glproto/build b/packages/x11/proto/glproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/glproto/build
+++ b/packages/x11/proto/glproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/inputproto/build b/packages/x11/proto/inputproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/inputproto/build
+++ b/packages/x11/proto/inputproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/kbproto/build b/packages/x11/proto/kbproto/build
index 32369bfdf..61a168bf6 100755
--- a/packages/x11/proto/kbproto/build
+++ b/packages/x11/proto/kbproto/build
@@ -10,8 +10,6 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
 
 $MAKE
 
diff --git a/packages/x11/proto/randrproto/build b/packages/x11/proto/randrproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/randrproto/build
+++ b/packages/x11/proto/randrproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/renderproto/build b/packages/x11/proto/renderproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/renderproto/build
+++ b/packages/x11/proto/renderproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/resourceproto/build b/packages/x11/proto/resourceproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/resourceproto/build
+++ b/packages/x11/proto/resourceproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/scrnsaverproto/build b/packages/x11/proto/scrnsaverproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/scrnsaverproto/build
+++ b/packages/x11/proto/scrnsaverproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/videoproto/build b/packages/x11/proto/videoproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/videoproto/build
+++ b/packages/x11/proto/videoproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xcb-proto/build b/packages/x11/proto/xcb-proto/build
index d6820e710..50eb7b7c5 100755
--- a/packages/x11/proto/xcb-proto/build
+++ b/packages/x11/proto/xcb-proto/build
@@ -9,12 +9,7 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
 $MAKEINSTALL
-
-#$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
-#  $SYSROOT_PREFIX/usr/lib/pkgconfig/xcb-proto.pc
diff --git a/packages/x11/proto/xcmiscproto/build b/packages/x11/proto/xcmiscproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xcmiscproto/build
+++ b/packages/x11/proto/xcmiscproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xextproto/build b/packages/x11/proto/xextproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xextproto/build
+++ b/packages/x11/proto/xextproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xf86bigfontproto/build b/packages/x11/proto/xf86bigfontproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xf86bigfontproto/build
+++ b/packages/x11/proto/xf86bigfontproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xf86dgaproto/build b/packages/x11/proto/xf86dgaproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xf86dgaproto/build
+++ b/packages/x11/proto/xf86dgaproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xf86driproto/build b/packages/x11/proto/xf86driproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xf86driproto/build
+++ b/packages/x11/proto/xf86driproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xf86miscproto/build b/packages/x11/proto/xf86miscproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xf86miscproto/build
+++ b/packages/x11/proto/xf86miscproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xf86vidmodeproto/build b/packages/x11/proto/xf86vidmodeproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xf86vidmodeproto/build
+++ b/packages/x11/proto/xf86vidmodeproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make
 
diff --git a/packages/x11/proto/xproto/build b/packages/x11/proto/xproto/build
index c4d8779fc..50eb7b7c5 100755
--- a/packages/x11/proto/xproto/build
+++ b/packages/x11/proto/xproto/build
@@ -9,8 +9,6 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
 
 make