diff --git a/bin/create_oe_depedencies.sh b/bin/create_oe_depedencies.sh
index 288c5ee9..dd2883e4 100644
--- a/bin/create_oe_depedencies.sh
+++ b/bin/create_oe_depedencies.sh
@@ -22,6 +22,6 @@ tar --create --verbose --gzip --absolute-names --show-transformed-names --derefe
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXext.so.6" \
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXrender.so.1" \
 	"$IMX6_ROOTFS/usr/lib/arm-linux-gnueabihf/libXt.so.6" \
-	"./hyperiond.sh" \
-	"./hyperion-remote.sh"
+	"./openelec/hyperiond.sh" \
+	"./openelec/hyperion-remote.sh"
 
diff --git a/bin/create_release.sh b/bin/create_release.sh
index c44fb5c5..05af75e5 100644
--- a/bin/create_release.sh
+++ b/bin/create_release.sh
@@ -14,7 +14,9 @@ if ! [ -d "$builddir" ]; then
 	echo "Could not find build director"
 	exit 1
 fi
-	
+
+#Create RPI .tar.gz
+if [ "$buildid" = "rpi" ]; then
 outfile="$repodir/deploy/hyperion_$buildid.tar.gz"
 echo create $outfile
 
@@ -23,18 +25,69 @@ tar --create --verbose --gzip --absolute-names --show-transformed-names --ignore
 	--transform "s:$builddir/bin/:hyperion/bin/:" \
 	--transform "s:$repodir/effects/:hyperion/effects/:" \
 	--transform "s:$repodir/config/:hyperion/config/:" \
-	--transform "s:$repodir/bin/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
-	--transform "s:$repodir/bin/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
-	--transform "s:$repodir/bin/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
 	--transform "s://:/:g" \
 	"$builddir/bin/hyperiond" \
 	"$builddir/bin/hyperion-remote" \
 	"$builddir/bin/hyperion-v4l2" \
-	"$builddir/bin/gpio2spi" \
-	"$builddir/bin/dispmanx2png" \
+	"$builddir/bin/hyperion-dispmanx" \
 	"$repodir/effects/"* \
-	"$repodir/bin/hyperion.init.sh" \
-	"$repodir/bin/hyperion.systemd.sh" \
-	"$repodir/bin/hyperion.initctl.sh" \
+	"$repodir/bin/service/hyperion.init.sh" \
+	"$repodir/bin/service/hyperion.systemd.sh" \
+	"$repodir/bin/service/hyperion.initctl.sh" \
 	"$repodir/config/hyperion.config.json"
+fi
+exit 0
 
+#Create Wetek imx6 .tar.gz
+if [ "$buildid" = "wetek" ] || [ "$buildid" = "imx6" ]; then
+outfile="$repodir/deploy/hyperion_$buildid.tar.gz"
+echo create $outfile
+
+tar --create --verbose --gzip --absolute-names --show-transformed-names --ignore-failed-read\
+	--file "$outfile" \
+	--transform "s:$builddir/bin/:hyperion/bin/:" \
+	--transform "s:$repodir/effects/:hyperion/effects/:" \
+	--transform "s:$repodir/config/:hyperion/config/:" \
+	--transform "s:$repodir/bin/service/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
+	--transform "s://:/:g" \
+	"$builddir/bin/hyperiond" \
+	"$builddir/bin/hyperion-remote" \
+	"$builddir/bin/hyperion-v4l2" \
+	"$repodir/effects/"* \
+	"$repodir/bin/service/hyperion.init.sh" \
+	"$repodir/bin/service/hyperion.systemd.sh" \
+	"$repodir/bin/service/hyperion.initctl.sh" \
+	"$repodir/config/hyperion.config.json"
+fi
+exit 0
+
+#Create x32 and x64 .tar.gz
+if [ "$buildid" = "x32" ] || [ "$buildid" = "x64" ]; then
+outfile="$repodir/deploy/hyperion_$buildid.tar.gz"
+echo create $outfile
+
+tar --create --verbose --gzip --absolute-names --show-transformed-names --ignore-failed-read\
+	--file "$outfile" \
+	--transform "s:$builddir/bin/:hyperion/bin/:" \
+	--transform "s:$repodir/effects/:hyperion/effects/:" \
+	--transform "s:$repodir/config/:hyperion/config/:" \
+	--transform "s:$repodir/bin/service/hyperion.init.sh:hyperion/init.d/hyperion.init.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.systemd.sh:hyperion/init.d/hyperion.systemd.sh:" \
+	--transform "s:$repodir/bin/service/hyperion.initctl.sh:hyperion/init.d/hyperion.initctl.sh:" \
+	--transform "s://:/:g" \
+	"$builddir/bin/hyperiond" \
+	"$builddir/bin/hyperion-remote" \
+	"$builddir/bin/hyperion-v4l2" \
+	"$builddir/bin/hyperion-x11" \
+	"$repodir/effects/"* \
+	"$repodir/bin/service/hyperion.init.sh" \
+	"$repodir/bin/service/hyperion.systemd.sh" \
+	"$repodir/bin/service/hyperion.initctl.sh" \
+	"$repodir/config/hyperion.config.json"
+fi
+exit 0
\ No newline at end of file
diff --git a/bin/remove_hyperion.sh b/bin/remove_hyperion.sh
index 2b0c2788..3b6627e2 100644
--- a/bin/remove_hyperion.sh
+++ b/bin/remove_hyperion.sh
@@ -94,6 +94,8 @@ else
 	rm -v /usr/bin/hyperiond 2>/dev/null
 	rm -v /usr/bin/hyperion-remote 2>/dev/null
 	rm -v /usr/bin/hyperion-v4l2 2>/dev/null
+	rm -v /usr/bin/hyperion-dispmanx 2>/dev/null
+	rm -v /usr/bin/hyperion-x11 2>/dev/null
 	rm -v /etc/hyperion.config.json 2>/dev/null
 	echo "---> Remove binaries"
 	rm -rv /opt/hyperion 2>/dev/null