diff --git a/build/scripts/automysqlbackup.sh b/build/scripts/automysqlbackup.sh
index cf757f5..f0d1d9b 100644
--- a/build/scripts/automysqlbackup.sh
+++ b/build/scripts/automysqlbackup.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env AUTOMYSQLBACKUP_VERSION_MAJOR 3.0
 export_env AUTOMYSQLBACKUP_VERSION_MINOR rc6
diff --git a/build/scripts/backintime.sh b/build/scripts/backintime.sh
index 2d51f35..c96dbd5 100644
--- a/build/scripts/backintime.sh
+++ b/build/scripts/backintime.sh
@@ -1,13 +1,2 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Environment
-
-
-## BackInTime
-apt_install_permanent backintime-common python-dbus
-
-## Configuration
-
+## Back In Time
+apt_install_permanent backintime-common python-dbus
\ No newline at end of file
diff --git a/build/scripts/btsync.sh b/build/scripts/btsync.sh
old mode 100755
new mode 100644
index 5e308f0..cd6e26a
--- a/build/scripts/btsync.sh
+++ b/build/scripts/btsync.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Configuration
 export_env BTSYNC_CONFIG /host/etc/btsync/btsync.conf
 export_env BTSYNC_DATA /host/var/btsync
diff --git a/build/scripts/chrome.sh b/build/scripts/chrome.sh
index 5b8869f..b8e563f 100644
--- a/build/scripts/chrome.sh
+++ b/build/scripts/chrome.sh
@@ -1,9 +1,4 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Chrome dependencies
+## Dependencies
 apt_install_permanent gconf-service libasound2 libatk1.0-0 libcairo2 libcap2 libcups2 libcurl3 libfontconfig1 libgdk-pixbuf2.0-0 libgtk2.0-0 libnspr4 libnss3 libpango1.0-0 librtmp0 libxss1 libxtst6 xdg-utils
 
 ## Chrome
@@ -11,4 +6,4 @@ mkdir -p /usr/share/icons/hicolor
 cd /opt
 wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 dpkg -i google-chrome-stable_current_amd64.deb
-rm google-chrome-stable_current_amd64.deb
+rm google-chrome-stable_current_amd64.deb
\ No newline at end of file
diff --git a/build/scripts/cleanup.sh b/build/scripts/cleanup.sh
old mode 100755
new mode 100644
index 978951a..4abbb60
--- a/build/scripts/cleanup.sh
+++ b/build/scripts/cleanup.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Remove temporary packages for minimal builds
 if [ $MODE == "minimal" ] && [ -f /build/temporary ]; then
 cat /build/temporary
diff --git a/build/scripts/collectd.sh b/build/scripts/collectd.sh
index 7247446..642e479 100644
--- a/build/scripts/collectd.sh
+++ b/build/scripts/collectd.sh
@@ -1,7 +1 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## collectd
 apt_install_permanent libsensors4 collectd
\ No newline at end of file
diff --git a/build/scripts/compile.sh b/build/scripts/compile.sh
old mode 100755
new mode 100644
index f5086da..1deb565
--- a/build/scripts/compile.sh
+++ b/build/scripts/compile.sh
@@ -1,7 +1 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Often used tools
 apt_install_temporary build-essential yasm cmake automake autopoint autoconf libtool pkg-config
diff --git a/build/scripts/couchpotato.sh b/build/scripts/couchpotato.sh
index f5bedee..cb33920 100644
--- a/build/scripts/couchpotato.sh
+++ b/build/scripts/couchpotato.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env COUCHPOTATO_CONFIG /host/etc/couchpotato/config.ini    
 export_env COUCHPOTATO_DATA /host/var/lib/couchpotato
diff --git a/build/scripts/cron.sh b/build/scripts/cron.sh
index d41e1a4..e788e4d 100644
--- a/build/scripts/cron.sh
+++ b/build/scripts/cron.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Install cron daemon
 apt_install_permanent cron
 
diff --git a/build/scripts/encoders.sh b/build/scripts/encoders.sh
index 0b23833..3715fb2 100644
--- a/build/scripts/encoders.sh
+++ b/build/scripts/encoders.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Enable multimedia sources in APT
 echo 'deb http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
 echo 'deb-src http://www.deb-multimedia.org jessie main non-free' >> /etc/apt/sources.list
diff --git a/build/scripts/ffmpeg.sh b/build/scripts/ffmpeg.sh
index ff41ba8..0c51c15 100644
--- a/build/scripts/ffmpeg.sh
+++ b/build/scripts/ffmpeg.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env FFMPEG_VERSION 2.8.6
 
diff --git a/build/scripts/ftpd.sh b/build/scripts/ftpd.sh
new file mode 100644
index 0000000..b8bc834
--- /dev/null
+++ b/build/scripts/ftpd.sh
@@ -0,0 +1,5 @@
+## Environment
+export_env FTP_DATA /host/var/lib/ftp
+
+## Pure-FTPd
+apt_install_permanent pure-ftpd
\ No newline at end of file
diff --git a/build/scripts/gmrender.sh b/build/scripts/gmrender.sh
index f857107..719e8e5 100644
--- a/build/scripts/gmrender.sh
+++ b/build/scripts/gmrender.sh
@@ -1,24 +1,15 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-# GMediaRender dependencies
+## GMediaRender dependencies
 apt_install_permanent libupnp-dev libgstreamer0.10-dev \
             gstreamer0.10-plugins-base gstreamer0.10-plugins-good \
             gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly \
             gstreamer0.10-ffmpeg \
             gstreamer0.10-pulseaudio gstreamer0.10-alsa
 
-# GMediaRender
+## GMediaRender
 cd opt
 git clone https://github.com/hzeller/gmrender-resurrect.git
 cd gmrender-resurrect
 autoreconf || automake --add-missing
 ./configure
 make
-make install
-
-## Runit script
-mkdir /etc/service/gmrender
-mv /build/runit/gmrender /etc/service/gmrender/run
\ No newline at end of file
+make install
\ No newline at end of file
diff --git a/build/scripts/hamachi.sh b/build/scripts/hamachi.sh
index a041dce..16e2c3b 100644
--- a/build/scripts/hamachi.sh
+++ b/build/scripts/hamachi.sh
@@ -1,18 +1,9 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
+## Environment
+export_env HAMACHI_DATA /host/var/lib/logmein-hamachi
+export_env HAMACHI_VERSION 2.1.0.119
 
-## Hamachi dependency
+## Dependencies
 apt_install_permanent lsb-core net-tools socat strace
 
 ## Hamachi
-cd /opt
-export HAMACHI_DATA=/host/var/lib/logmein-hamachi
-export HAMACHI_VERSION=2.1.0.119
-wget -O hamachi.deb https://secure.logmein.com/labs/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb
-mkdir -p /etc/service/hamachi
-cp /build/runit/hamachi /etc/service/hamachi/run
-
-## Environment variables
-echo -n $HAMACHI_DATA > /etc/container_environment/HAMACHI_DATA
\ No newline at end of file
+wget -P /opt -O hamachi.deb https://secure.logmein.com/labs/logmein-hamachi_$HAMACHI_VERSION-1_amd64.deb
\ No newline at end of file
diff --git a/build/scripts/headphones.sh b/build/scripts/headphones.sh
index 607cc16..2fcc2d6 100644
--- a/build/scripts/headphones.sh
+++ b/build/scripts/headphones.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env HEADPHONES_CONFIG /host/etc/headphones/config.ini
 export_env HEADPHONES_CONFIG_DEFAULT /opt/headphones/config.ini
@@ -10,4 +5,4 @@ export_env HEADPHONES_DATA /host/var/lib/headphones
 
 ## Headphones
 cd /opt
-git clone https://github.com/rembo10/headphones.git
+git clone https://github.com/rembo10/headphones.git
\ No newline at end of file
diff --git a/build/scripts/jekyll.sh b/build/scripts/jekyll.sh
new file mode 100644
index 0000000..5deac89
--- /dev/null
+++ b/build/scripts/jekyll.sh
@@ -0,0 +1 @@
+apt_install_permanent make net-tools python3
\ No newline at end of file
diff --git a/build/scripts/jenkins.sh b/build/scripts/jenkins.sh
new file mode 100644
index 0000000..5deac89
--- /dev/null
+++ b/build/scripts/jenkins.sh
@@ -0,0 +1 @@
+apt_install_permanent make net-tools python3
\ No newline at end of file
diff --git a/build/scripts/kodi.sh b/build/scripts/kodi.sh
index 93e6681..b7d11bc 100644
--- a/build/scripts/kodi.sh
+++ b/build/scripts/kodi.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-    
 ## Configuration
 export_env KODI_ROOT /opt/kodi-server
 export_env KODI_VERSION 16.0
diff --git a/build/scripts/latex.sh b/build/scripts/latex.sh
index f0106a0..3589e11 100644
--- a/build/scripts/latex.sh
+++ b/build/scripts/latex.sh
@@ -1,7 +1 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Install
 apt_install_permanent texlive-full python-pygments gnuplot
\ No newline at end of file
diff --git a/build/scripts/lighttpd-php.sh b/build/scripts/lighttpd-php.sh
index c5e42e3..0c1adde 100644
--- a/build/scripts/lighttpd-php.sh
+++ b/build/scripts/lighttpd-php.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env PHP_CONFIG /host/etc/php.ini
 export_env PHP_FCGI_CONFIG /etc/lighttpd/conf-enabled/15-fastcgi-php.conf
@@ -15,4 +10,4 @@ ln -s /etc/lighttpd/conf-available/10-fastcgi.conf /etc/lighttpd/conf-enabled/
 cp /etc/lighttpd/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-enabled/
 sed -i "s,\(\"PHP_FCGI_CHILDREN\"\s*=>\s*\"\).*$,\1$PHP_FCGI_CHILDREN\"\,," $PHP_FCGI_CONFIG
 sed -i "s,\(\"PHP_FCGI_MAX_REQUESTS\"\s*=>\s*\"\).*$,\1$PHP_FCGI_MAX_REQUESTS\"\,," $PHP_FCGI_CONFIG
-sed -i "s,\(\"socket\"\),\"host\" => \"127.0.0.1\"\,\n\t\t\"port\" => $PHP_FCGI_PORT\,\n\t\t#\1," $PHP_FCGI_CONFIG
+sed -i "s,\(\"socket\"\),\"host\" => \"127.0.0.1\"\,\n\t\t\"port\" => $PHP_FCGI_PORT\,\n\t\t#\1," $PHP_FCGI_CONFIG
\ No newline at end of file
diff --git a/build/scripts/lighttpd.sh b/build/scripts/lighttpd.sh
old mode 100755
new mode 100644
index 1e7c93c..0418a91
--- a/build/scripts/lighttpd.sh
+++ b/build/scripts/lighttpd.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env LIGHTTPD_VERSION_MAJOR 1.4
 export_env LIGHTTPD_VERSION_MINOR 39
@@ -35,4 +30,4 @@ if [ $MODE == "minimal" ]; then
     cd /opt
     rm -r lighttpd-$LIGHTTPD_VERSION
     rm lighttpd-$LIGHTTPD_VERSION.tar.gz
-fi
+fi
\ No newline at end of file
diff --git a/build/scripts/minidlna.sh b/build/scripts/minidlna.sh
index cdb057b..50d93ce 100644
--- a/build/scripts/minidlna.sh
+++ b/build/scripts/minidlna.sh
@@ -1,31 +1,17 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
+## Environment
+export_env MINIDLNA_VERSION 1.1.1
+export_env MINIDLNA_CONFIG /host/etc/minidlna.conf
+export_env MINIDLNA_LOG /host/var/log/minidlna.log
+export_env MINIDLNA_DATA /host/var/lib/minidlna
 
-# MiniDLNA dependencies
+## Dependencies
 apt_install_permanent gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev
 
-export MINIDLNA_VERSION=1.1.1
-export MINIDLNA_CONFIG=/host/etc/minidlna.conf
-export MINIDLNA_LOG=/host/var/log/minidlna.log
-export MINIDLNA_DATA=/host/var/lib/minidlna
-
 # MiniDLNA
-cd opt
+cd /opt
 wget http://downloads.sourceforge.net/project/minidlna/minidlna/$MINIDLNA_VERSION/minidlna-$MINIDLNA_VERSION.tar.gz
 tar xzf minidlna-$MINIDLNA_VERSION.tar.gz
 cd minidlna-$MINIDLNA_VERSION
 ./configure
 make
-make install
-
-## Runit script
-mkdir /etc/service/minidlna
-mv /build/runit/minidlna /etc/service/minidlna/run
-
-## Environment variables
-echo -n $MINIDLNA_VERSION > /etc/container_environment/MINIDLNA_VERSION
-echo -n $MINIDLNA_CONFIG > /etc/container_environment/MINIDLNA_CONFIG
-echo -n $MINIDLNA_LOG > /etc/container_environment/MINIDLNA_LOG
-echo -n $MINIDLNA_DATA > /etc/container_environment/MINIDLNA_DATA
\ No newline at end of file
+make install
\ No newline at end of file
diff --git a/build/scripts/mysql.sh b/build/scripts/mysql.sh
index d836810..dac80b9 100644
--- a/build/scripts/mysql.sh
+++ b/build/scripts/mysql.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## MySQL
 debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy'
 debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy'
@@ -21,4 +16,4 @@ tee -a $MYSQL_CONFIG <<EOF
 
 [mysqld]
 skip-grant-tables
-EOF
+EOF
\ No newline at end of file
diff --git a/build/scripts/php.sh b/build/scripts/php.sh
old mode 100755
new mode 100644
index 09e506d..19b353e
--- a/build/scripts/php.sh
+++ b/build/scripts/php.sh
@@ -1,10 +1,5 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
-export_env PHP_VERSION 5.6.20
+export_env PHP_VERSION 5.6.21
 export_env PHP_CONFIG /usr/local/lib/php.ini
 export_env PHP_TIMEZONE Europe/London
 
diff --git a/build/scripts/phpmyadmin.sh b/build/scripts/phpmyadmin.sh
old mode 100755
new mode 100644
index 5445fa2..bf1404a
--- a/build/scripts/phpmyadmin.sh
+++ b/build/scripts/phpmyadmin.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## phpMyAdmin
 export_env PMA_VERSION 4.6.0
 export_env PMA_ROOT /var/www/html
@@ -30,4 +25,4 @@ EOF
 if [ $MODE == "minimal" ]; then
     cd /opt
     rm phpMyAdmin-$PMA_VERSION-all-languages.tar.gz
-fi
+fi
\ No newline at end of file
diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh
old mode 100755
new mode 100644
index 13bee23..3b52c3a
--- a/build/scripts/prepare.sh
+++ b/build/scripts/prepare.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Create directories and files
 mkdir /etc/container_environment
 mkdir /opt/init.d
diff --git a/build/scripts/pulseaudio.sh b/build/scripts/pulseaudio.sh
index 6d1c6d0..ec4a6bf 100644
--- a/build/scripts/pulseaudio.sh
+++ b/build/scripts/pulseaudio.sh
@@ -1,10 +1,5 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Pulseaudio
 apt_install_permanent pulseaudio
 
-## Setup environment
+## Configuration
 sed -i "1iexport PULSE_SERVER=host" /root/.profile
\ No newline at end of file
diff --git a/build/scripts/redis.sh b/build/scripts/redis.sh
index fcd87c5..5fce40e 100644
--- a/build/scripts/redis.sh
+++ b/build/scripts/redis.sh
@@ -1,45 +1,21 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
+## Environment
+export_env REDIS_CONFIG=/etc/redis/redis.conf
+export_env REDIS_LOG=/host/var/log/redis/redis.log
+export_env REDIS_DATA=/host/var/lib/redis
+export_env REDIS_VERSION=stable
 
-## Redis
+## Redis (repository)
 apt_install_permanent redis-server
 
-export REDIS_CONFIG=/etc/redis/redis.conf
-export REDIS_LOG=/host/var/log/redis/redis.log
-export REDIS_DATA=/host/var/lib/redis
+## Reds (compile)
+cd /opt
+wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz
+tar xzf redis-$REDIS_VERSION.tar.gz
+cd redis-$REDIS_VERSION
+make
 
+## Configuration
+mkdir -p `dirname $REDIS_CONFIG`
 sed -i "s,^\(daemonize\s*\).*$,\1no," $REDIS_CONFIG
 sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG
-sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG
-
-## Runit script
-mkdir /etc/service/redis
-mv /build/runit/redis /etc/service/redis/run
-
-## Environment variables
-echo -n $REDIS_CONFIG > /etc/container_environment/REDIS_CONFIG
-echo -n $REDIS_LOG > /etc/container_environment/REDIS_LOG
-echo -n $REDIS_DATA > /etc/container_environment/REDIS_DATA
-
-
-## TODO
-# ENV REDIS_VERSION stable
-
-# RUN cd /opt && \
-    # wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz && \
-    # tar xzf redis-$REDIS_VERSION.tar.gz && \
-    # cd redis-$REDIS_VERSION && \
-    # make
-
-# RUN chmod +x /opt/redis-$REDIS_VERSION/src/redis-server
-
-# ENV REDIS_CONFIG /etc/redis/redis-server.conf
-# ENV REDIS_LOG /host/var/log/redis/redis-server.log
-# ENV REDIS_DATA /host/var/lib/redis
-
-# RUN mkdir -p `dirname $REDIS_CONFIG`
-# RUN cp /opt/redis-$REDIS_VERSION/redis.conf $REDIS_CONFIG
-# RUN sed -i "s,^\(logfile\s*\).*$,\1$REDIS_LOG," $REDIS_CONFIG
-# RUN sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG
\ No newline at end of file
+sed -i "s,^\(dir\s*\).*$,\1$REDIS_DATA," $REDIS_CONFIG
\ No newline at end of file
diff --git a/build/scripts/runit.sh b/build/scripts/runit.sh
index 19bed64..0db021c 100644
--- a/build/scripts/runit.sh
+++ b/build/scripts/runit.sh
@@ -1,7 +1 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Install runit
-apt_install_permanent runit
+apt_install_permanent runit
\ No newline at end of file
diff --git a/build/scripts/sabnzbd.sh b/build/scripts/sabnzbd.sh
index f03a292..9acd6cf 100644
--- a/build/scripts/sabnzbd.sh
+++ b/build/scripts/sabnzbd.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env RAR_VERSION 4.1.1
 export_env SABNZBD_CONFIG /host/etc/sabnzbd/sabnzbd.ini
diff --git a/build/scripts/sickbeard.sh b/build/scripts/sickbeard.sh
index c0cd042..121cc0d 100644
--- a/build/scripts/sickbeard.sh
+++ b/build/scripts/sickbeard.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env SICKBEARD_CONFIG /host/etc/sickbeard/config.ini    
 export_env SICKBEARD_DATA /host/var/lib/sickbeard 
diff --git a/build/scripts/sonarr.sh b/build/scripts/sonarr.sh
index a33bc70..60f549e 100644
--- a/build/scripts/sonarr.sh
+++ b/build/scripts/sonarr.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 export_env SONARR_DATA /host/var/lib/sonarr
 
diff --git a/build/scripts/sshd.sh b/build/scripts/sshd.sh
index a46b5b6..fd643ea 100644
--- a/build/scripts/sshd.sh
+++ b/build/scripts/sshd.sh
@@ -1,9 +1,4 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Install the SSH server
+## Install OpenSSH
 apt_install_permanent openssh-server
 mkdir /var/run/sshd
 
diff --git a/build/scripts/subliminal.sh b/build/scripts/subliminal.sh
index 40e7525..6cdbdc2 100644
--- a/build/scripts/subliminal.sh
+++ b/build/scripts/subliminal.sh
@@ -1,9 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Subliminal
 pip install git+git://github.com/Diaoul/subliminal.git
 cat << EOF > /opt/subliminal
 #!/bin/bash
diff --git a/build/scripts/syncthing.sh b/build/scripts/syncthing.sh
index 714b17f..0d44183 100644
--- a/build/scripts/syncthing.sh
+++ b/build/scripts/syncthing.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Configuration
 export_env SYNCTHING_CONFIG /host/etc/syncthing
 export_env SYNCTHING_VERSION 0.12.20
diff --git a/build/scripts/syslog.sh b/build/scripts/syslog.sh
index 8cc36de..120bd0d 100644
--- a/build/scripts/syslog.sh
+++ b/build/scripts/syslog.sh
@@ -1,9 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Install a syslog daemon
 apt_install_permanent syslog-ng-core
 mkdir -p /var/lib/syslog-ng
-sed -i "s/^\(#SYSLOGNG_OPTS=\).*$/\1\"--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat\"/" /etc/default/syslog-ng
+sed -i "s/^\(#SYSLOGNG_OPTS=\).*$/\1\"--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat\"/" /etc/default/syslog-ng
\ No newline at end of file
diff --git a/build/scripts/transmission.sh b/build/scripts/transmission.sh
index 17ef1e8..8972ce5 100644
--- a/build/scripts/transmission.sh
+++ b/build/scripts/transmission.sh
@@ -1,14 +1,9 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Transmission
-apt_install_permanent transmission-daemon jq
-
 ## Environment
 export_env TRANSMISSION_CONFIG /host/etc/transmission
 export_env TRANSMISSION_TORRENTS /host/srv/torrents
 export_env TRANSMISSION_DOWNLOAD /host/tmp/downloads
 export_env TRANSMISSION_COMPLETE /host/srv/downloads
-export_env TRANSMISSION_LOG /host/var/log/transmission/error.log
\ No newline at end of file
+export_env TRANSMISSION_LOG /host/var/log/transmission/error.log
+
+## Transmission
+apt_install_permanent transmission-daemon jq
\ No newline at end of file
diff --git a/build/scripts/upnpproxy.sh b/build/scripts/upnpproxy.sh
index a248ea1..8ae0fb9 100644
--- a/build/scripts/upnpproxy.sh
+++ b/build/scripts/upnpproxy.sh
@@ -1,24 +1,11 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## UPnP Proxy dependency
+## Dependency
 apt_install_permanent uuid-dev
 
 ## UPnP Proxy
-cd opt
+cd /opt
 git clone git://git.savannah.nongnu.org/upnpproxy.git
 cd upnpproxy
 autoreconf || automake --add-missing
 ./configure
 make
-make install
-
-## Runit script
-mkdir /etc/service/upnpproxy
-mv /build/runit/upnpproxy /etc/service/upnpproxy/run
-
-## Environment variables
-export UPNPPROXY_CONFIG=/host/etc/upnpproxy.conf
-echo -n $UPNPPROXY_CONFIG > /etc/container_environment/UPNPPROXY_CONFIG
+make install
\ No newline at end of file
diff --git a/build/scripts/utilities.sh b/build/scripts/utilities.sh
old mode 100755
new mode 100644
index 637d65a..cb06ed5
--- a/build/scripts/utilities.sh
+++ b/build/scripts/utilities.sh
@@ -1,10 +1,5 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Often used tools
 apt_install_permanent psmisc wget curl python-pip git gawk zip gperf unzip bzip2 inetutils-ping inetutils-telnet rsync
 
 ## Often used python modules
-pip install argparse
+pip install argparse
\ No newline at end of file
diff --git a/build/scripts/webserver.sh b/build/scripts/webserver.sh
index 2e990be..dc5cc08 100644
--- a/build/scripts/webserver.sh
+++ b/build/scripts/webserver.sh
@@ -1,8 +1,3 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
 ## Environment
 import_env LIGHTTPD_CONFIG
 export_env LIGHTTPD_DOMAINS /host/etc/lighttpd