diff --git a/packages/addons/service/multimedia/boblightd/changelog.txt b/packages/addons/service/multimedia/boblightd/changelog.txt
index 49ba90c485..4709b5211b 100644
--- a/packages/addons/service/multimedia/boblightd/changelog.txt
+++ b/packages/addons/service/multimedia/boblightd/changelog.txt
@@ -1,3 +1,6 @@
+2.0.4
+- Fixed so that boblightd will not start it's already running
+
 2.0.3
 - Removed LD_LIBRARY_PATH dependencies
 
diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta
index c38d3d6981..04bed3ad36 100644
--- a/packages/addons/service/multimedia/boblightd/meta
+++ b/packages/addons/service/multimedia/boblightd/meta
@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="2.0.3"
-PKG_REV="3"
+PKG_VERSION="2.0.4"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
diff --git a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
index c118773fe2..d789a536a0 100755
--- a/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
+++ b/packages/addons/service/multimedia/boblightd/source/bin/boblightd.service
@@ -37,24 +37,30 @@ BOBLIGHT_CONFIG="$ADDON_HOME/boblight.conf"
 # Flag file to start boblight-x11 daemon
 BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
 
+export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
+
 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
 
-if [ -e $BOBLIGHT_CONFIG ]; then
-
-	# Make sure the xserver has started up
-	wait_for_xorg
+if [ ! $(pidof boblightd) ]; then
+	if [ -e $BOBLIGHT_CONFIG ]; then
 	
-	# Start the boblight daemon
-	boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
-
+		# Make sure the xserver has started up
+		wait_for_xorg
+		
+		# Start the boblight daemon
+		boblightd -c $BOBLIGHT_CONFIG -f >> $LOG_FILE 2>&1
+	
+	fi
 fi
 
-if [ -e $BOBLIGHT_X11 ]; then
-
-        # Make sure the xserver has started up
-        wait_for_xorg
-
-        # Start the boblight daemon
-        boblight-X11 -f >> $LOG_FILE 2>&1
-
+if [ ! $(pidof boblight-X11) ]; then                                               
+	if [ -e $BOBLIGHT_X11 ]; then
+	
+	        # Make sure the xserver has started up
+	        wait_for_xorg
+	
+	        # Start the boblight daemon
+	        boblight-X11 -f >> $LOG_FILE 2>&1
+	
+	fi
 fi
diff --git a/packages/addons/service/web/maraschino/addon b/packages/addons/service/web/maraschino/addon
new file mode 100755
index 0000000000..1c2f35f10d
--- /dev/null
+++ b/packages/addons/service/web/maraschino/addon
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/
+  cp -PR $ADDON_BUILD/$PKG_ADDON_ID/settings_example.py $ADDON_BUILD/$PKG_ADDON_ID/settings.py
+  sed 's/\/path\/to\/maraschino.db/\/storage\/.xbmc\/userdata\/addon_data\/service.web.maraschino\/maraschino.db/' -i $ADDON_BUILD/$PKG_ADDON_ID/settings.py
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/CherryPy*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
\ No newline at end of file
diff --git a/packages/addons/service/web/maraschino/changelog.txt b/packages/addons/service/web/maraschino/changelog.txt
new file mode 100644
index 0000000000..80e79ec0cf
--- /dev/null
+++ b/packages/addons/service/web/maraschino/changelog.txt
@@ -0,0 +1,2 @@
+0.99.1
+- initial version maraschino-923de4c
diff --git a/packages/addons/service/web/maraschino/icon/icon.png b/packages/addons/service/web/maraschino/icon/icon.png
new file mode 100644
index 0000000000..5112b330ee
Binary files /dev/null and b/packages/addons/service/web/maraschino/icon/icon.png differ
diff --git a/packages/addons/service/web/maraschino/meta b/packages/addons/service/web/maraschino/meta
new file mode 100644
index 0000000000..1f955948f2
--- /dev/null
+++ b/packages/addons/service/web/maraschino/meta
@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="maraschino"
+PKG_VERSION="923de4c"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.maraschinoproject.com/"
+PKG_URL="https://dl.dropbox.com/u/9676785/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python"
+PKG_BUILD_DEPENDS="toolchain Python CherryPy"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/web"
+PKG_SHORTDESC="Maraschino: Web interface to act as a nice overview/front page for my XBMC HTPC"
+PKG_LONGDESC="Maraschino is an XBMC web interface with customisable applications module providing quick access to your web interfaces (e.g. SABnzb+, SickBeard, or whatever else you want to link to), recently added episodes module, media library browser, currently playing bar and disk space module."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"
diff --git a/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch b/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch
new file mode 100644
index 0000000000..4f62c2b6b4
--- /dev/null
+++ b/packages/addons/service/web/maraschino/patches/maraschino-923de4c-remote.patch
@@ -0,0 +1,13 @@
+--- a/modules/remote.py
++++ b/modules/remote.py
+@@ -13,7 +13,7 @@ connected = False
+ def update_xbmc_object():
+     host = get_setting_value('server_hostname')
+     try:
+-        icon = os.path.abspath('static/images/maraschino_logo.png')
++        icon = os.path.abspath('/storage/.xbmc/addons/service.web.maraschino/static/images/maraschino_logo.png')
+ 
+         if not os.path.exists(icon):
+             icon = os.path.abspath('maraschino/static/images/maraschino_logo.png')
+
+
diff --git a/packages/addons/service/web/maraschino/source/bin/maraschino.service b/packages/addons/service/web/maraschino/source/bin/maraschino.service
new file mode 100755
index 0000000000..d4e4dc9ee7
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/bin/maraschino.service
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/service.web.maraschino"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.web.maraschino"
+
+  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
+
+################################################################################
+# start maraschino
+################################################################################
+  python $ADDON_DIR/maraschino-cherrypy.py -q
diff --git a/packages/addons/service/web/maraschino/source/default.py b/packages/addons/service/web/maraschino/source/default.py
new file mode 100644
index 0000000000..70e35dda15
--- /dev/null
+++ b/packages/addons/service/web/maraschino/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import xbmc, time, os, subprocess
+
+subprocess.Popen("maraschino.service", shell=True, close_fds=True)
diff --git a/packages/python/web/CherryPy/build b/packages/python/web/CherryPy/build
new file mode 100755
index 0000000000..191ff8365e
--- /dev/null
+++ b/packages/python/web/CherryPy/build
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+
+python setup.py build
+python setup.py install -O0 --no-compile --prefix /usr --root .install
+
+rm -rf .install/usr/bin
diff --git a/packages/python/web/CherryPy/meta b/packages/python/web/CherryPy/meta
new file mode 100644
index 0000000000..69fffb61c6
--- /dev/null
+++ b/packages/python/web/CherryPy/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="CherryPy"
+PKG_VERSION="3.2.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://cherrypy.org/"
+PKG_URL="http://download.cherrypy.org/cherrypy/3.2.2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distribute"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="CherrPy: A Pythonic, object-orientated web framework"
+PKG_LONGDESC="CherryPy allows developers to build web applications in much the same way they would build any other object-oriented Python program. This results in smaller source code developed in less time."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"