diff --git a/packages/graphics/libpng12/build b/packages/3rdparty/graphics/libpng12/build
similarity index 100%
rename from packages/graphics/libpng12/build
rename to packages/3rdparty/graphics/libpng12/build
diff --git a/packages/graphics/libpng12/meta b/packages/3rdparty/graphics/libpng12/meta
similarity index 100%
rename from packages/graphics/libpng12/meta
rename to packages/3rdparty/graphics/libpng12/meta
diff --git a/packages/graphics/libpng12/unpack b/packages/3rdparty/graphics/libpng12/unpack
similarity index 100%
rename from packages/graphics/libpng12/unpack
rename to packages/3rdparty/graphics/libpng12/unpack
diff --git a/packages/security/nss/build b/packages/3rdparty/security/nss/build
similarity index 100%
rename from packages/security/nss/build
rename to packages/3rdparty/security/nss/build
diff --git a/packages/security/nss/meta b/packages/3rdparty/security/nss/meta
similarity index 100%
rename from packages/security/nss/meta
rename to packages/3rdparty/security/nss/meta
diff --git a/packages/textproc/bbe/build b/packages/3rdparty/textproc/bbe/build
similarity index 100%
rename from packages/textproc/bbe/build
rename to packages/3rdparty/textproc/bbe/build
diff --git a/packages/textproc/bbe/meta b/packages/3rdparty/textproc/bbe/meta
similarity index 100%
rename from packages/textproc/bbe/meta
rename to packages/3rdparty/textproc/bbe/meta
diff --git a/packages/graphics/libpng12/install b/packages/3rdparty/x11/app/xdotool/build
similarity index 94%
rename from packages/graphics/libpng12/install
rename to packages/3rdparty/x11/app/xdotool/build
index 0ca72c8177..1f5e21e076 100755
--- a/packages/graphics/libpng12/install
+++ b/packages/3rdparty/x11/app/xdotool/build
@@ -21,3 +21,8 @@
 ################################################################################
 
 . config/options $1
+
+cd $PKG_BUILD
+
+make xdotool.static
+mv xdotool.static xdotool
diff --git a/packages/3rdparty/x11/app/xdotool/meta b/packages/3rdparty/x11/app/xdotool/meta
new file mode 100644
index 0000000000..b4bfc9d227
--- /dev/null
+++ b/packages/3rdparty/x11/app/xdotool/meta
@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xdotool"
+PKG_VERSION="2.20110530.1"
+PKG_REV="1"
+PKG_ARCH=""
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.semicomplete.com/projects/xdotool/"
+PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/app"
+PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
+PKG_LONGDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/x11/lib/libXcursor/build b/packages/3rdparty/x11/lib/libXcursor/build
new file mode 100755
index 0000000000..a47c4d38fa
--- /dev/null
+++ b/packages/3rdparty/x11/lib/libXcursor/build
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --enable-shared
+
+make
+$MAKEINSTALL
diff --git a/packages/security/nss/install b/packages/3rdparty/x11/lib/libXcursor/install
similarity index 92%
rename from packages/security/nss/install
rename to packages/3rdparty/x11/lib/libXcursor/install
index 0ca72c8177..b37dd417f9 100755
--- a/packages/security/nss/install
+++ b/packages/3rdparty/x11/lib/libXcursor/install
@@ -21,3 +21,6 @@
 ################################################################################
 
 . config/options $1
+
+#mkdir -p $INSTALL/usr/lib
+#  cp -P $PKG_BUILD/src/.libs/libXcursor.so* $INSTALL/usr/lib
diff --git a/packages/3rdparty/x11/lib/libXcursor/meta b/packages/3rdparty/x11/lib/libXcursor/meta
new file mode 100644
index 0000000000..6812cb87af
--- /dev/null
+++ b/packages/3rdparty/x11/lib/libXcursor/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libXcursor"
+PKG_VERSION="1.1.13"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+# PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.mirrorservice.org/sites/ftp.x.org/pub/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libXfixes libXrender libX11"
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/lib"
+PKG_SHORTDESC="libXcursor: X Cursor Library"
+PKG_LONGDESC="X11 Cursor management library"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
diff --git a/packages/x11/other/ratpoison/init.d/73_ratpoison b/packages/x11/other/ratpoison/init.d/73_ratpoison
index 49f9e20e6f..c4846ace6e 100644
--- a/packages/x11/other/ratpoison/init.d/73_ratpoison
+++ b/packages/x11/other/ratpoison/init.d/73_ratpoison
@@ -29,5 +29,9 @@
     wait_for_xorg
 
   # starting ratpoison
-    DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+    if [ -f /storage/.config/ratpoisonrc ]; then
+      DISPLAY=:0.0 ratpoison -f /storage/.config/ratpoisonrc > /dev/null 2>&1
+    else
+      DISPLAY=:0.0 ratpoison > /dev/null 2>&1
+    fi
 )&
diff --git a/packages/x11/toolkits/pango/config/pangorc b/packages/x11/toolkits/pango/config/pangorc
new file mode 100644
index 0000000000..da60cdad42
--- /dev/null
+++ b/packages/x11/toolkits/pango/config/pangorc
@@ -0,0 +1,6 @@
+[Pango]
+ModuleFiles = /etc/pango/pango.modules
+ModulesPath = /usr/lib/pango/1.6.0/modules
+
+[PangoX]
+AliasFiles = /etc/pango/pangox.aliases
diff --git a/packages/x11/toolkits/pango/install b/packages/x11/toolkits/pango/install
index 7e65c9e7a8..95cf37ffa2 100755
--- a/packages/x11/toolkits/pango/install
+++ b/packages/x11/toolkits/pango/install
@@ -38,3 +38,4 @@ mkdir -p $INSTALL/usr/bin
 mkdir -p $INSTALL/etc/pango
   cp $PKG_BUILD/$1/pangox.aliases $INSTALL/etc/pango
   cp $PKG_DIR/config/pango.modules $INSTALL/etc/pango
+  cp $PKG_DIR/config/pangorc $INSTALL/etc/pango