diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh
old mode 100755
new mode 100644
index 09ecb6c5..a0d6bd5c
--- a/bin/install_hyperion.sh
+++ b/bin/install_hyperion.sh
@@ -16,26 +16,28 @@ fi
 # Stop hyperion daemon if it is running
 /sbin/initctl stop hyperion
 
-# Get and extract the Hyperion binaries and effects to /opt
-wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
+# Get the Hyperion executable
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
+chmod +x /usr/bin/hyperiond
 
-# create links to the binaries
-ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
-ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
+# Get the Hyperion command line utility
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
+chmod +x /usr/bin/hyperion-remote
 
-# create link to the gpio changer (gpio->spi)
+# Copy the gpio changer (gpio->spi) to the /usr/bin
 if [ $IS_XBIAN -eq 0 ]; then
-	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
+	chmod +x /usr/bin/gpio2spi
 fi
 
-# Copy a link to the hyperion configuration file to /etc
-ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
+# Copy the hyperion configuration file to /etc
+wget -N github.com/tvdzwan/hyperion/raw/master/config/hyperion.config.json -P /etc/
 
 # Copy the service control configuration to /etc/int
 if [ $IS_XBIAN -eq 0 ]; then
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
 else
-	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
 fi
 
 # Start the hyperion daemon
diff --git a/bin/update_hyperion.sh b/bin/update_hyperion.sh
new file mode 100755
index 00000000..8e1996b5
--- /dev/null
+++ b/bin/update_hyperion.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Script for downloading and installing the latest Hyperion release
+
+# Find out if we are on XBian
+IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
+
+# Make sure that the boblight daemon is no longer running
+BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
+if [ $BOBLIGHT_PROCNR -eq 1 ];
+then
+	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
+	exit
+fi
+
+# Stop hyperion daemon if it is running
+/sbin/initctl stop hyperion
+
+# Get the Hyperion executable
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
+chmod +x /usr/bin/hyperiond
+
+# Get the Hyperion command line utility
+wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
+chmod +x /usr/bin/hyperion-remote
+
+# Copy the gpio changer (gpio->spi) to the /usr/bin
+if [ $IS_XBIAN -eq 0 ]; then
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
+	chmod +x /usr/bin/gpio2spi
+fi
+
+# Copy the service control configuration to /etc/int
+if [ $IS_XBIAN -eq 0 ]; then
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
+else
+	wget -N github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.xbian.conf -P /etc/init/ -O hyperion.conf
+fi
+
+# Start the hyperion daemon
+/sbin/initctl start hyperion
diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id
index 0ae7510f..90278ffd 100644
--- a/deploy/HyperCon.jar.REMOVED.git-id
+++ b/deploy/HyperCon.jar.REMOVED.git-id
@@ -1 +1 @@
-0e33a5994203b58676a56efa2addf362a276c219
\ No newline at end of file
+a63791e2794fa0c76a2a5da3d0ce7b3e4f4089ff
\ No newline at end of file
diff --git a/deploy/dispmanx2png b/deploy/dispmanx2png
new file mode 100755
index 00000000..deff3974
Binary files /dev/null and b/deploy/dispmanx2png differ
diff --git a/deploy/gpio2spi b/deploy/gpio2spi
new file mode 100755
index 00000000..f999003f
Binary files /dev/null and b/deploy/gpio2spi differ
diff --git a/deploy/hyperion-remote b/deploy/hyperion-remote
new file mode 100755
index 00000000..2d4a01e9
Binary files /dev/null and b/deploy/hyperion-remote differ
diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id
new file mode 100644
index 00000000..b969c543
--- /dev/null
+++ b/deploy/hyperiond.REMOVED.git-id
@@ -0,0 +1 @@
+cb10b0acda414c8d57cd1cc1bf49c48c142ec6b8
\ No newline at end of file
diff --git a/install_hyperion.new.sh b/install_hyperion.new.sh
new file mode 100755
index 00000000..09ecb6c5
--- /dev/null
+++ b/install_hyperion.new.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Script for downloading and installing the latest Hyperion release
+
+# Find out if we are on XBian
+IS_XBIAN=`cat /etc/issue | grep XBian | wc -l`
+
+# Make sure that the boblight daemon is no longer running
+BOBLIGHT_PROCNR=$(ps -e | grep "boblight" | wc -l)
+if [ $BOBLIGHT_PROCNR -eq 1 ];
+then
+	echo 'Found running instance of boblight. Please stop boblight via XBMC menu before installing hyperion'
+	exit
+fi
+
+# Stop hyperion daemon if it is running
+/sbin/initctl stop hyperion
+
+# Get and extract the Hyperion binaries and effects to /opt
+wget https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.tar.gz -O - | tar -C /opt -xz
+
+# create links to the binaries
+ln -fs /opt/hyperion/bin/hyperiond /usr/bin/hyperiond
+ln -fs /opt/hyperion/bin/hyperion-remote /usr/bin/hyperion-remote
+
+# create link to the gpio changer (gpio->spi)
+if [ $IS_XBIAN -eq 0 ]; then
+	ln -fs /opt/hyperion/bin/gpio2spi /usr/bin/gpio2spi
+fi
+
+# Copy a link to the hyperion configuration file to /etc
+ln -s /opt/hyperion/config/hyperion.config.json /etc/hyperion.config.json
+
+# Copy the service control configuration to /etc/int
+if [ $IS_XBIAN -eq 0 ]; then
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.conf -P /etc/init/
+else
+	wget -N https://raw.github.com/tvdzwan/hyperion/master/deploy/hyperion.xbian.conf -O /etc/init/hyperion.conf
+fi
+
+# Start the hyperion daemon
+/sbin/initctl start hyperion