diff --git a/README-CN.md b/README-CN.md
index 2c9f0d6..7a5f0de 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -1,5 +1,5 @@
 ## 介绍
-`rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.11.y```). 
+`rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.14.y```). 
 
 ## 构建环境所依赖的包
 一定要安装好下列deb包, 他们是构建过程需要的核心包. 脚本会自动检查, 如果缺少,经用户确认后会自动安装. 
diff --git a/README.md b/README.md
index 36d9ed3..533ec19 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,16 @@
 # rpi23-gen-image
 ## Introduction
+`rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for all Raspberry Pi computers. The script at this time supports the bootstrapping of the Debian (armhf/armel) releases `stretch` and `buster`. Raspberry Pi 0/1/2/3 images are generated for 32-bit mode only. Raspberry Pi 3 supports 64-bit images that can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.14.y```).
 
-`rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie`, `stretch` and `buster`. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y```).
 
 ## Build dependencies
 The following list of Debian packages must be installed on the build system because they are essentially required for the bootstrapping process. The script will check if all required packages are installed and missing packages will be installed automatically if confirmed by the user.
 
   ```debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo```
 
-It is recommended to configure the `rpi23-gen-image.sh` script to build and install the latest Raspberry Pi Linux kernel. For the RPi3 this is mandatory. Kernel compilation and linking will be performed on the build system using an ARM (armhf) cross-compiler toolchain.
+It is recommended to configure the `rpi23-gen-image.sh` script to build and install the latest Raspberry Pi Linux kernel. For the Raspberry 3 this is mandatory. Kernel compilation and linking will be performed on the build system using an ARM (armhf/armel) cross-compiler toolchain.
 
-The script has been tested using the default `crossbuild-essential-armhf` toolchain meta package on Debian Linux `jessie` and `stretch` build systems. Please check the [Debian CrossToolchains Wiki](https://wiki.debian.org/CrossToolchains) for further information.
-
-If a Debian Linux `jessie` build system is used it will be required to add the [Debian Cross-toolchains repository](http://emdebian.org/tools/debian/) first:
-
-```
-echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/crosstools.list
-sudo -u nobody wget -O - http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
-dpkg --add-architecture armhf
-apt-get update
-```
+The script has been tested using the default `crossbuild-essential-armhf` and `crossbuild-essential-armel` toolchain meta packages on Debian Linux `stretch` build systems. Please check the [Debian CrossToolchains Wiki](https://wiki.debian.org/CrossToolchains) for further information.
 
 ## Command-line parameters
 The script accepts certain command-line parameters to enable or disable specific OS features, services and configuration settings. These parameters are passed to the `rpi23-gen-image.sh` script via (simple) shell-variables. Unlike environment shell-variables (simple) shell-variables are defined at the beginning of the command-line call of the `rpi23-gen-image.sh` script.
@@ -56,35 +47,37 @@ CONFIG_TEMPLATE=rpi2stretch ./rpi23-gen-image.sh
 Set Debian packages server address. Choose a server from the list of Debian worldwide [mirror sites](https://www.debian.org/mirror/list). Using a nearby server will probably speed-up all required downloads within the bootstrapping process.
 
 ##### `APT_PROXY`=""
-Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once.
+Set Proxy server address. Using a local Proxy-Cache like `apt-cacher-ng` will speed-up the bootstrapping process because all required Debian packages will only be downloaded from the Debian mirror site once. If `apt-cacher-ng` is running on default `http://127.0.0.1:3142` it is autodetected and you don't need to set this.
 
 ##### `APT_INCLUDES`=""
-A comma separated list of additional packages to be installed by debootstrap during bootstrapping.
+A comma-separated list of additional packages to be installed by debootstrap during bootstrapping.
 
 ##### `APT_INCLUDES_LATE`=""
-A comma separated list of additional packages to be installed by apt after bootstrapping and after APT sources are set up.  This is useful for packages with pre-depends, which debootstrap do not handle well.
+A comma-separated list of additional packages to be installed by apt after bootstrapping and after APT sources are set up.  This is useful for packages with pre-depends, which debootstrap do not handle well.
 
 ---
 
 #### General system settings:
+##### `SET_ARCH`=32
+Set Architecture to default 32bit. If you want to compile 64-bit (RPI3 or RPI3+) set it to `64`. This option will set every needed cross-compiler or board specific option for a successful build.
+
 ##### `RPI_MODEL`=2
-Specifiy the target Raspberry Pi hardware model. The script at this time supports the following Raspberry Pi models:
-`0`  = Used for Raspberry Pi 0 and Raspberry Pi 0 W
-`1`  = Used for Pi 1 model A and B
-`1P` = Used for Pi 1 model B+ and A+
-`2`  = Used for Pi 2 model B
-`3`  = Used for Pi 3 model B
-`3P` = Used for Pi 3 model B+
-`BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` or `3P` is used.
-
-##### `RELEASE`="jessie"
-Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie", "stretch" and "buster". `BUILD_KERNEL`=true will automatically be set if the Debian releases `stretch` or `buster` are used.
+Specify the target Raspberry Pi hardware model. The script at this time supports the following Raspberry Pi models:
+- `0`  = Raspberry Pi 0 and Raspberry Pi 0 W
+- `1`  = Raspberry Pi 1 model A and B
+- `1P` = Raspberry Pi 1 model B+ and A+
+- `2`  = Raspberry Pi 2 model B
+- `3`  = Raspberry Pi 3 model B
+- `3P` = Raspberry Pi 3 model B+
+
+##### `RELEASE`="buster"
+Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases `stretch` and `buster`.
 
 ##### `RELEASE_ARCH`="armhf"
 Set the desired Debian release architecture.
 
 ##### `HOSTNAME`="rpi$RPI_MODEL-$RELEASE"
-Set system host name. It's recommended that the host name is unique in the corresponding subnet.
+Set system hostname. It's recommended that the hostname is unique in the corresponding subnet.
 
 ##### `PASSWORD`="raspberry"
 Set system `root` password. It's **STRONGLY** recommended that you choose a custom password.
@@ -124,7 +117,7 @@ Set extra xkb configuration options.
 ---
 
 #### Networking settings (DHCP):
-This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
+This parameter is used to set up networking auto-configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
 
 ##### `ENABLE_DHCP`=true
 Set the system to use DHCP. This requires an DHCP server.
@@ -147,7 +140,7 @@ Set the IP address for the first DNS server.
 Set the IP address for the second DNS server.
 
 ##### `NET_DNS_DOMAINS`=""
-Set the default DNS search domains to use for non fully qualified host names.
+Set the default DNS search domains to use for non fully qualified hostnames.
 
 ##### `NET_NTP_1`=""
 Set the IP address for the first NTP server.
@@ -159,13 +152,25 @@ Set the IP address for the second NTP server.
 
 #### Basic system features:
 ##### `ENABLE_CONSOLE`=true
-Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system.
+Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2/3. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system. On RPI `0` `3` `3P` the CPU speed is locked at lowest speed.
+
+##### `ENABLE_PRINTK`=false
+Enables printing kernel messages to konsole. printk is `3 4 1 3` as in raspbian.
+
+##### `ENABLE_BLUETOOTH`=false
+Enable onboard Bluetooth interface on the RPi0/3/3P. See: [Configuring the GPIO serial port on Raspbian jessie and stretch](https://spellfoundry.com/2016/05/29/configuring-gpio-serial-port-raspbian-jessie-including-pi-3/).
+
+##### `ENABLE_MINIUART_OVERLAY`=false
+Enable Bluetooth to use this. Adds overlay to swap UART0 with UART1. Enabling (slower) Bluetooth and full speed serial console. - RPI `0` `3` `3P` have a fast `hardware UART0` (ttyAMA0) and a `mini UART1` (ttyS0)! RPI `1` `1P` `2` only have a `hardware UART0`. `UART0` is considered better, because is faster and more stable than `mini UART1`. By default the Bluetooth modem is mapped to the `hardware UART0` and `mini UART` is used for console. The `mini UART` is a problem for the serial console, because its baudrate depends on the CPU frequency, which is changing on runtime. Resulting in a volatile baudrate and thus in an unusable serial console.
+ 
+##### `ENABLE_TURBO`=false
+Enable Turbo mode. This setting locks cpu at the highest frequency. As setting ENABLE_CONSOLE=true locks RPI to lowest CPU speed, this is can be used additionally to lock cpu hat max speed. Need a good power supply and probably cooling for the Raspberry PI.
 
 ##### `ENABLE_I2C`=false
-Enable I2C interface on the RPi2/3. Please check the [RPi2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
+Enable I2C interface on the RPi 0/1/2/3. Please check the [RPi 0/1/2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
 
 ##### `ENABLE_SPI`=false
-Enable SPI interface on the RPi2/3. Please check the [RPi2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
+Enable SPI interface on the RPi 0/1/2/3. Please check the [RPi 0/1/2/3 pinout diagrams](https://elinux.org/RPi_Low-level_peripherals) to connect the right GPIO pins.
 
 ##### `ENABLE_IPV6`=true
 Enable IPv6 support. The network interface configuration is managed via systemd-networkd.
@@ -177,17 +182,16 @@ Install and enable OpenSSH service. The default configuration of the service doe
 Allow the installation of non-free Debian packages that do not comply with the DFSG. This is required to install closed-source firmware binary blobs.
 
 ##### `ENABLE_WIRELESS`=false
-Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
+Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
 
 ##### `ENABLE_RSYSLOG`=true
-If set to false, disable and uninstall rsyslog (so logs will be available only
-in journal files)
+If set to false, disable and uninstall rsyslog (so logs will be available only in journal files)
 
 ##### `ENABLE_SOUND`=true
 Enable sound hardware and install Advanced Linux Sound Architecture.
 
 ##### `ENABLE_HWRANDOM`=true
-Enable Hardware Random Number Generator. Strong random numbers are important for most network based communications that use encryption. It's recommended to be enabled.
+Enable Hardware Random Number Generator. Strong random numbers are important for most network-based communications that use encryption. It's recommended to be enabled.
 
 ##### `ENABLE_MINGPU`=false
 Minimize the amount of shared memory reserved for the GPU. It doesn't seem to be possible to fully disable the GPU.
@@ -199,7 +203,10 @@ Install and enable D-Bus message bus. Please note that systemd should work witho
 Install Xorg open-source X Window System.
 
 ##### `ENABLE_WM`=""
-Install a user defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi23-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`.
+Install a user-defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi23-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`.
+
+##### `ENABLE_SYSVINIT`=false
+Support for halt,init,poweroff,reboot,runlevel,shutdown,telinit commands
 
 ---
 
@@ -211,7 +218,7 @@ Use debootstrap script variant `minbase` which only includes essential packages 
 Reduce the disk space usage by deleting packages and files. See `REDUCE_*` parameters for detailed information.
 
 ##### `ENABLE_UBOOT`=false
-Replace the default RPi2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](https://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol.
+Replace the default RPi 0/1/2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](https://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol.
 
 ##### `UBOOTSRC_DIR`=""
 Path to a directory (`u-boot`) of [U-Boot bootloader sources](https://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot.
@@ -222,11 +229,17 @@ Install and enable the [hardware accelerated Xorg video driver](https://github.c
 ##### `FBTURBOSRC_DIR`=""
 Path to a directory (`xf86-video-fbturbo`) of [hardware accelerated Xorg video driver sources](https://github.com/ssvb/xf86-video-fbturbo) that will be copied, configured, build and installed inside the chroot.
 
+##### `ENABLE_VIDEOCORE`=false
+Install and enable the [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) `vcgencmd`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling.
+
+##### `VIDEOCORESRC_DIR`=""
+Path to a directory (`userland`) of [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) that will be copied, configured, build and installed inside the chroot.
+
 ##### `ENABLE_IPTABLES`=false
 Enable iptables IPv4/IPv6 firewall. Simplified ruleset: Allow all outgoing connections. Block all incoming connections except to OpenSSH service.
 
 ##### `ENABLE_USER`=true
-Create non-root user with password `USER_PASSWORD`=raspberry. Unless overridden with `USER_NAME`=user, username will be `pi`.
+Create non-root user with password `USER_PASSWORD`=raspberry. Unless overridden with `USER_NAME`=user, the username will be `pi`.
 
 ##### `USER_NAME`=pi
 Non-root user to create.  Ignored if `ENABLE_USER`=false
@@ -247,7 +260,7 @@ Path to a directory with scripts that should be run in the chroot before the ima
 Create an initramfs that that will be loaded during the Linux startup process. `ENABLE_INITRAMFS` will automatically get enabled if `ENABLE_CRYPTFS`=true. This parameter will be ignored if `BUILD_KERNEL`=false.
 
 ##### `ENABLE_IFNAMES`=true
-Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names. This parameter is only supported if the Debian releases `stretch` or `buster` are used.
+Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names.
 
 ##### `DISABLE_UNDERVOLT_WARNINGS`=
 Disable RPi2/3 under-voltage warnings and overlays. Setting the parameter to `1` will disable the warning overlay. Setting it to `2` will additionally allow RPi2/3 turbo mode when low-voltage is present.
@@ -256,10 +269,10 @@ Disable RPi2/3 under-voltage warnings and overlays. Setting the parameter to `1`
 
 #### SSH settings:
 ##### `SSH_ENABLE_ROOT`=false
-Enable password root login via SSH. This may be a security risk with default password, use only in trusted environments. `ENABLE_ROOT` must be set to `true`.
+Enable password-based root login via SSH. This may be a security risk with the default password set, use only in trusted environments. `ENABLE_ROOT` must be set to `true`.
 
 ##### `SSH_DISABLE_PASSWORD_AUTH`=false
-Disable password based SSH authentication. Only public key based SSH (v2) authentication will be supported.
+Disable password-based SSH authentication. Only public key based SSH (v2) authentication will be supported.
 
 ##### `SSH_LIMIT_USERS`=false
 Limit the users that are allowed to login via SSH. Only allow user `USER_NAME`=pi and root if `SSH_ENABLE_ROOT`=true to login. This parameter will be ignored if `dropbear` SSH is used (`REDUCE_SSHD`=true).
@@ -273,11 +286,11 @@ Add SSH (v2) public key(s) from specified file to `authorized_keys` file to enab
 ---
 
 #### Kernel compilation:
-##### `BUILD_KERNEL`=false
-Build and install the latest RPi2/3 Linux kernel. Currently only the default RPi2/3 kernel configuration is used. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
+##### `BUILD_KERNEL`=true
+Build and install the latest RPi 0/1/2/3 Linux kernel. Currently only the default RPi 0/1/2/3 kernel configuration is used.
 
 ##### `CROSS_COMPILE`="arm-linux-gnueabihf-"
-This sets the cross compile enviornment for the compiler.
+This sets the cross-compile environment for the compiler.
 
 ##### `KERNEL_ARCH`="arm"
 This sets the kernel architecture for the compiler.
@@ -295,13 +308,13 @@ Sets the QEMU enviornment for the Debian archive. If not set, `QEMU_BINARY` will
 Sets the default config for kernel compiling. If not set, `KERNEL_DEFCONFIG` will be set to "bcmrpi3\_defconfig" automatically if building for arm64.
 
 ##### `KERNEL_REDUCE`=false
-Reduce the size of the generated kernel by removing unwanted device, network and filesystem drivers (experimental).
+Reduce the size of the generated kernel by removing unwanted devices, network and filesystem drivers (experimental).
 
 ##### `KERNEL_THREADS`=1
 Number of parallel kernel building threads. If the parameter is left untouched the script will automatically determine the number of CPU cores to set the number of parallel threads to speed the kernel compilation.
 
 ##### `KERNEL_HEADERS`=true
-Install kernel headers with built kernel.
+Install kernel headers with the built kernel.
 
 ##### `KERNEL_MENUCONFIG`=false
 Start `make menuconfig` interactive menu-driven kernel configuration. The script will continue after `make menuconfig` was terminated.
@@ -397,9 +410,9 @@ The functions of this script that are required for the different stages of the b
 | `10-bootstrap.sh` | Debootstrap basic system |
 | `11-apt.sh` | Setup APT repositories |
 | `12-locale.sh` | Setup Locales and keyboard settings |
-| `13-kernel.sh` | Build and install RPi2/3 Kernel |
+| `13-kernel.sh` | Build and install RPi 0/1/2/3 Kernel |
 | `14-fstab.sh` | Setup fstab and initramfs |
-| `15-rpi-config.sh` | Setup RPi2/3 config and cmdline |
+| `15-rpi-config.sh` | Setup RPi 0/1/2/3 config and cmdline |
 | `20-networking.sh` | Setup Networking |
 | `21-firewall.sh` | Setup Firewall |
 | `30-security.sh` | Setup Users and Security settings |
@@ -407,6 +420,7 @@ The functions of this script that are required for the different stages of the b
 | `32-sshd.sh` | Setup SSH and public keys |
 | `41-uboot.sh` | Build and Setup U-Boot |
 | `42-fbturbo.sh` | Build and Setup fbturbo Xorg driver |
+| `43-videocore.sh` | Build and Setup videocore libraries |
 | `50-firstboot.sh` | First boot actions |
 | `99-reduce.sh` | Reduce the disk space usage |
 
@@ -415,7 +429,7 @@ All the required configuration files that will be copied to the generated OS ima
 | Directory | Description |
 | --- | --- |
 | `apt` | APT management configuration files |
-| `boot` | Boot and RPi2/3 configuration files |
+| `boot` | Boot and RPi 0/1/2/3 configuration files |
 | `dpkg` | Package Manager configuration |
 | `etc` | Configuration files and rc scripts |
 | `firstboot` | Scripts that get executed on first boot  |
@@ -441,17 +455,17 @@ script -c 'APT_SERVER=ftp.de.debian.org ./rpi23-gen-image.sh' ./build.log
 ```
 
 ## Flashing the image file
-After the image file was successfully created by the `rpi23-gen-image.sh` script it can be copied to the microSD card that will be used by the RPi2/3 computer. This can be performed by using the tools `bmaptool` or `dd`. Using `bmaptool` will probably speed-up the copy process because `bmaptool` copies more wisely than `dd`.
+After the image file was successfully created by the `rpi23-gen-image.sh` script it can be copied to the microSD card that will be used by the RPi 0/1/2/3 computer. This can be performed by using the tools `bmaptool` or `dd`. Using `bmaptool` will probably speed-up the copy process because `bmaptool` copies more wisely than `dd`.
 
 ##### Flashing examples:
 ```shell
-bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie.img /dev/mmcblk0
-dd bs=4M if=./images/jessie/2017-01-23-rpi3-jessie.img of=/dev/mmcblk0
+bmaptool copy ./images/buster/2017-01-23-rpi3-buster.img /dev/mmcblk0
+dd bs=4M if=./images/buster/2017-01-23-rpi3-buster.img of=/dev/mmcblk0
 ```
 If you have set `ENABLE_SPLITFS`, copy the `-frmw` image on the microSD card, then the `-root` one on the USB drive:
 ```shell
-bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-frmw.img /dev/mmcblk0
-bmaptool copy ./images/jessie/2017-01-23-rpi3-jessie-root.img /dev/sdc
+bmaptool copy ./images/buster/2017-01-23-rpi3-buster-frmw.img /dev/mmcblk0
+bmaptool copy ./images/buster/2017-01-23-rpi3-buster-root.img /dev/sdc
 ```
 
 ## QEMU emulation
@@ -475,10 +489,6 @@ Start QEMU full system emulation with cryptfs, initramfs and output to console:
 qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no-reboot -dtb vexpress-v2p-ca15_a7.dtb -sd ${IMAGE_NAME}.qcow2 -initrd "initramfs-${KERNEL_VERSION}" -append "root=/dev/mapper/secure cryptdevice=/dev/mmcblk0p2:secure rw rootfstype=ext4 console=ttyAMA0,115200 init=/bin/systemd" -serial stdio
 ```
 
-## Weekly image builds
-The image files are provided by JRWR'S I/O PORT and are built once a Sunday at midnight UTC!
-* [Debian Stretch Raspberry Pi2/3 Weekly Image Builds](https://jrwr.io/doku.php?id=projects:debianpi)
-
 ## External links and references
 * [Debian worldwide mirror sites](https://www.debian.org/mirror/list)
 * [Debian Raspberry Pi 2 Wiki](https://wiki.debian.org/RaspberryPi2)
diff --git a/bootstrap.d/10-bootstrap.sh b/bootstrap.d/10-bootstrap.sh
index b0dd8e4..d8cfb69 100644
--- a/bootstrap.d/10-bootstrap.sh
+++ b/bootstrap.d/10-bootstrap.sh
@@ -7,7 +7,6 @@
 
 VARIANT=""
 COMPONENTS="main"
-EXCLUDES=""
 
 # Use non-free Debian packages if needed
 if [ "$ENABLE_NONFREE" = true ] ; then
@@ -19,13 +18,8 @@ if [ "$ENABLE_MINBASE" = true ] ; then
   VARIANT="--variant=minbase"
 fi
 
-# Exclude packages if required by Debian release
-if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-  EXCLUDES="--exclude=init,systemd-sysv"
-fi
-  
 # Base debootstrap (unpack only)
-http_proxy=${APT_PROXY} debootstrap ${EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
+http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
 
 # Copy qemu emulator binary to chroot
 install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 7794053..544781c 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -11,46 +11,23 @@ if [ -z "$APT_PROXY" ] ; then
   sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
 fi
 
-if [ "$BUILD_KERNEL" = false ] ; then
-  # Install APT pinning configuration for flash-kernel package
-  install_readonly files/apt/flash-kernel "${ETC_DIR}/apt/preferences.d/flash-kernel"
-
-  # Install APT sources.list
-  install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
-  echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETC_DIR}/apt/sources.list"
-
-  # Upgrade collabora package index and install collabora keyring
-  chroot_exec apt-get -qq -y update
-  # Removed --allow-unauthenticated as suggested after modification on _apt privileges
-  chroot_exec apt-get -qq -y install collabora-obs-archive-keyring
-else # BUILD_KERNEL=true
-  # Install APT sources.list
-  install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
-
-  # Use specified APT server and release
-  sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
-  sed -i "s/ jessie/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
-fi
-
-# Allow the installation of non-free Debian packages
-if [ "$ENABLE_NONFREE" = true ] ; then
-  sed -i "s/ contrib/ contrib non-free/" "${ETC_DIR}/apt/sources.list"
-fi
-
 # Upgrade package index and update all installed packages and changed dependencies
 chroot_exec apt-get -qq -y update
 chroot_exec apt-get -qq -y -u dist-upgrade
 
+# Install additional packages
 if [ "$APT_INCLUDES_LATE" ] ; then
-  chroot_exec apt-get -qq -y install $(echo $APT_INCLUDES_LATE |tr , ' ')
+  chroot_exec apt-get -qq -y install "$(echo "$APT_INCLUDES_LATE" |tr , ' ')"
 fi
 
+# Install Debian custom packages
 if [ -d packages ] ; then
   for package in packages/*.deb ; do
-    cp $package ${R}/tmp
-    chroot_exec dpkg --unpack /tmp/$(basename $package)
+    cp "$package" "${R}"/tmp
+    chroot_exec dpkg --unpack /tmp/"$(basename "$package")"
   done
 fi
+
 chroot_exec apt-get -qq -y -f install
 
 chroot_exec apt-get -qq -y check
diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh
index e69f44c..9817d7a 100644
--- a/bootstrap.d/12-locale.sh
+++ b/bootstrap.d/12-locale.sh
@@ -6,11 +6,11 @@
 . ./functions.sh
 
 # Install and setup timezone
-echo ${TIMEZONE} > "${ETC_DIR}/timezone"
+echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
 chroot_exec dpkg-reconfigure -f noninteractive tzdata
 
 # Install and setup default locale and keyboard configuration
-if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then
+if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then
   # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug
   # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957
   # ... so we have to set locales manually
diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh
index a3c2e0c..a662049 100644
--- a/bootstrap.d/13-kernel.sh
+++ b/bootstrap.d/13-kernel.sh
@@ -8,12 +8,12 @@
 # Fetch and build latest raspberry kernel
 if [ "$BUILD_KERNEL" = true ] ; then
   # Setup source directory
-  mkdir -p "${R}/usr/src/linux"
+  mkdir -p "${KERNEL_DIR}"
 
   # Copy existing kernel sources into chroot directory
   if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
     # Copy kernel sources and include hidden files
-    cp -r "${KERNELSRC_DIR}/". "${R}/usr/src/linux"
+    cp -r "${KERNELSRC_DIR}/". "${KERNEL_DIR}"
 
     # Clean the kernel sources
     if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
@@ -28,10 +28,10 @@ if [ "$BUILD_KERNEL" = true ] ; then
       as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
     else
       as_nobody -H git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
-   fi
-    
+    fi
+
     # Copy downloaded kernel sources
-    cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
+    cp -r "${temp_dir}/linux/"* "${KERNEL_DIR}"
 
     # Remove temporary directory for kernel sources
     rm -fr "${temp_dir}"
@@ -89,30 +89,32 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
       # Set kernel configuration parameters to enable qemu emulation
       if [ "$ENABLE_QEMU" = true ] ; then
-        echo "CONFIG_FHANDLE=y" >> ${KERNEL_DIR}/.config
-        echo "CONFIG_LBDAF=y" >> ${KERNEL_DIR}/.config
+        echo "CONFIG_FHANDLE=y" >> "${KERNEL_DIR}"/.config
+        echo "CONFIG_LBDAF=y" >> "${KERNEL_DIR}"/.config
 
         if [ "$ENABLE_CRYPTFS" = true ] ; then
-          echo "CONFIG_EMBEDDED=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_EXPERT=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_DAX=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_MD=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_BLK_DEV_MD=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_MD_AUTODETECT=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_BLK_DEV_DM=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_BLK_DEV_DM_BUILTIN=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_DM_CRYPT=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_CRYPTO_BLKCIPHER=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_CRYPTO_CBC=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_CRYPTO_XTS=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_CRYPTO_SHA512=y" >> ${KERNEL_DIR}/.config
-          echo "CONFIG_CRYPTO_MANAGER=y" >> ${KERNEL_DIR}/.config
-	fi
+          {
+            echo "CONFIG_EMBEDDED=y"
+            echo "CONFIG_EXPERT=y"
+            echo "CONFIG_DAX=y"
+            echo "CONFIG_MD=y"
+            echo "CONFIG_BLK_DEV_MD=y"
+            echo "CONFIG_MD_AUTODETECT=y"
+            echo "CONFIG_BLK_DEV_DM=y"
+            echo "CONFIG_BLK_DEV_DM_BUILTIN=y"
+            echo "CONFIG_DM_CRYPT=y"
+            echo "CONFIG_CRYPTO_BLKCIPHER=y"
+            echo "CONFIG_CRYPTO_CBC=y"
+            echo "CONFIG_CRYPTO_XTS=y"
+            echo "CONFIG_CRYPTO_SHA512=y"
+            echo "CONFIG_CRYPTO_MANAGER=y"
+          } >> "${KERNEL_DIR}"/.config
+        fi
       fi
 
       # Copy custom kernel configuration file
-      if [ ! -z "$KERNELSRC_USRCONFIG" ] ; then
-        cp $KERNELSRC_USRCONFIG ${KERNEL_DIR}/.config
+      if [ -n "$KERNELSRC_USRCONFIG" ] ; then
+        cp "$KERNELSRC_USRCONFIG" "${KERNEL_DIR}"/.config
       fi
 
       # Set kernel configuration parameters to their default values
@@ -134,11 +136,11 @@ if [ "$BUILD_KERNEL" = true ] ; then
     fi
 
     # Cross compile kernel and dtbs
-    make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
+    make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
 
     # Cross compile kernel modules
-    if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
-      make -C "${KERNEL_DIR}" -j${KERNEL_THREADS} ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+      make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
     fi
   fi
 
@@ -151,16 +153,16 @@ if [ "$BUILD_KERNEL" = true ] ; then
 
   # Install kernel modules
   if [ "$ENABLE_REDUCE" = true ] ; then
-    if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
     fi
   else
-    if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
     fi
 
     # Install kernel firmware
-    if [ $(grep "^firmware_install:" "${KERNEL_DIR}/Makefile") ] ; then
+    if grep -q "^firmware_install:" "${KERNEL_DIR}/Makefile" ; then
       make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_FW_PATH=../../../lib firmware_install
     fi
   fi
@@ -174,14 +176,14 @@ if [ "$BUILD_KERNEL" = true ] ; then
   mkdir "${BOOT_DIR}"
 
   # Get kernel release version
-  KERNEL_VERSION=`cat "${KERNEL_DIR}/include/config/kernel.release"`
+  KERNEL_VERSION=$(cat "${KERNEL_DIR}/include/config/kernel.release")
 
   # Copy kernel configuration file to the boot directory
   install_readonly "${KERNEL_DIR}/.config" "${R}/boot/config-${KERNEL_VERSION}"
 
   # Prepare device tree directory
   mkdir "${BOOT_DIR}/overlays"
-  
+
   # Ensure the proper .dtb is located
   if [ "$KERNEL_ARCH" = "arm" ] ; then
     for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb ; do
@@ -223,8 +225,8 @@ if [ "$BUILD_KERNEL" = true ] ; then
     rm -fr "${KERNEL_DIR}"
   else
     # Prepare compiled kernel modules
-    if [ $(grep "CONFIG_MODULES=y" "${KERNEL_DIR}/.config") ] ; then
-      if [ $(grep "^modules_prepare:" "${KERNEL_DIR}/Makefile") ] ; then
+    if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
+      if grep -q "^modules_prepare:" "${KERNEL_DIR}/Makefile" ; then
         make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
       fi
 
@@ -242,7 +244,7 @@ else # BUILD_KERNEL=false
   chroot_exec apt-get -qq -y install flash-kernel
 
   # Check if kernel installation was successful
-  VMLINUZ="$(ls -1 ${R}/boot/vmlinuz-* | sort | tail -n 1)"
+  VMLINUZ="$(ls -1 "${R}"/boot/vmlinuz-* | sort | tail -n 1)"
   if [ -z "$VMLINUZ" ] ; then
     echo "error: kernel installation failed! (/boot/vmlinuz-* not found)"
     cleanup
diff --git a/bootstrap.d/14-fstab.sh b/bootstrap.d/14-fstab.sh
index 0a8eb19..2f68cdf 100644
--- a/bootstrap.d/14-fstab.sh
+++ b/bootstrap.d/14-fstab.sh
@@ -45,7 +45,7 @@ if [ "$BUILD_KERNEL" = true ] && [ "$ENABLE_INITRAMFS" = true ] ; then
     printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
 
     # Dummy mapping required by mkinitramfs
-    echo "0 1 crypt $(echo ${CRYPTFS_CIPHER} | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
+    echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
 
     # Generate initramfs with encrypted root partition support
     chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 6979b04..eda69bd 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -8,13 +8,13 @@
 if [ "$BUILD_KERNEL" = true ] ; then
   if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
     # Install boot binaries from local directory
-    cp ${RPI_FIRMWARE_DIR}/boot/bootcode.bin ${BOOT_DIR}/bootcode.bin
-    cp ${RPI_FIRMWARE_DIR}/boot/fixup.dat ${BOOT_DIR}/fixup.dat
-    cp ${RPI_FIRMWARE_DIR}/boot/fixup_cd.dat ${BOOT_DIR}/fixup_cd.dat
-    cp ${RPI_FIRMWARE_DIR}/boot/fixup_x.dat ${BOOT_DIR}/fixup_x.dat
-    cp ${RPI_FIRMWARE_DIR}/boot/start.elf ${BOOT_DIR}/start.elf
-    cp ${RPI_FIRMWARE_DIR}/boot/start_cd.elf ${BOOT_DIR}/start_cd.elf
-    cp ${RPI_FIRMWARE_DIR}/boot/start_x.elf ${BOOT_DIR}/start_x.elf
+    cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
+    cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat
+    cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat
+    cp "${RPI_FIRMWARE_DIR}"/boot/fixup_x.dat "${BOOT_DIR}"/fixup_x.dat
+    cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf
+    cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf
+    cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf
   else
     # Create temporary directory for boot binaries
     temp_dir=$(as_nobody mktemp -d)
@@ -42,23 +42,114 @@ fi
 
 # Setup firmware boot cmdline
 if [ "$ENABLE_SPLITFS" = true ] ; then
-  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
+  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
 else
-  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
+  CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1 init=/bin/systemd"
 fi
 
 # Add encrypted root partition to cmdline.txt
 if [ "$ENABLE_CRYPTFS" = true ] ; then
   if [ "$ENABLE_SPLITFS" = true ] ; then
-    CMDLINE=$(echo ${CMDLINE} | sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
+    CMDLINE=$(echo "${CMDLINE}" | sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
   else
-    CMDLINE=$(echo ${CMDLINE} | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")
+    CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")
   fi
 fi
 
-# Add serial console support
+#locks cpu at max frequency
+if [ "$ENABLE_TURBO" = true ] ; then
+  echo "force_turbo=1" >> "${BOOT_DIR}/config.txt"
+fi
+
+if [ "$ENABLE_PRINTK" = true ] ; then
+  install_readonly files/sysctl.d/83-rpi-printk.conf "${ETC_DIR}/sysctl.d/83-rpi-printk.conf"
+fi
+
+# Install udev rule for serial alias
+install_readonly files/etc/99-com.rules "${LIB_DIR}/udev/rules.d/99-com.rules"
+
+if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+  
+  # RPI0,3,3P Use default ttyS0 (mini-UART)as serial interface
+  SET_SERIAL="ttyS0"
+  
+  # Bluetooth enabled
+  if [ "$ENABLE_BLUETOOTH" = true ] ; then
+    # Create temporary directory for Bluetooth sources
+    temp_dir=$(as_nobody mktemp -d)
+
+    # Fetch Bluetooth sources
+    as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
+
+    # Copy downloaded sources
+    mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
+
+    # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
+    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
+    as_nobody wget -q -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
+
+    # Set permissions
+    chown -R root:root "${R}/tmp/pi-bluetooth"
+
+    # Install tools
+    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
+    install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
+
+    # Install bluetooth udev rule
+    install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
+
+    # Install Firmware Flash file and apropiate licence
+    mkdir -p "$BLUETOOTH_FIRMWARE_DIR"
+    install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+    install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${BLUETOOTH_FIRMWARE_DIR}/LICENCE.broadcom_bcm43xx"
+    install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
+    install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
+	
+    # Remove temporary directory
+    rm -fr "${temp_dir}"
+	
+    # Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 & 15. Slow Bluetooth and slow cpu. Use /dev/ttyS0 instead of /dev/ttyAMA0
+    if [ "$ENABLE_MINIUART_OVERLAY" = true ] ; then
+	  SET_SERIAL="ttyAMA0"
+
+	  # set overlay to swap ttyAMA0 and ttyS0
+      echo "dtoverlay=pi3-miniuart-bt" >> "${BOOT_DIR}/config.txt"
+
+	  # if force_turbo didn't lock cpu at high speed, lock it at low speed (XOR logic) or miniuart will be broken
+	  if [ "$ENABLE_TURBO" = false ] ; then 
+	    echo "core_freq=250" >> "${BOOT_DIR}/config.txt"
+	  fi
+	  
+	  # Activate services
+	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
+	else
+	  chroot_exec systemctl enable pi-bluetooth.hciuart.service
+	  #chroot_exec systemctl enable pi-bluetooth.bthelper@.service
+	fi
+	
+  else # if ENABLE_BLUETOOTH = false
+  	# set overlay to disable bluetooth
+    echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
+  fi # ENABLE_BLUETOOTH end
+
+else
+  # RPI1,1P,2 Use default ttyAMA0 (full UART) as serial interface
+  SET_SERIAL="ttyAMA0"
+fi
+
+# may need sudo systemctl disable hciuart
 if [ "$ENABLE_CONSOLE" = true ] ; then
-  CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
+  echo "enable_uart=1"  >> "${BOOT_DIR}/config.txt" 
+  # add string to cmdline
+  CMDLINE="${CMDLINE} console=serial0,115200"
+	  
+  # Enable serial console systemd style
+  chroot_exec systemctl enable serial-getty\@"$SET_SERIAL".service
+else
+  echo "enable_uart=0"  >> "${BOOT_DIR}/config.txt"
+  # disable serial console systemd style
+  chroot_exec systemctl disable serial-getty\@"$SET_SERIAL".service
 fi
 
 # Remove IPv6 networking support
@@ -73,11 +164,6 @@ else
   CMDLINE="${CMDLINE} net.ifnames=1"
 fi
 
-# Set init to systemd if required by Debian release
-if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-  CMDLINE="${CMDLINE} init=/bin/systemd"
-fi
-
 # Install firmware boot cmdline
 echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
 
@@ -94,30 +180,22 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then
   echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
 fi
 
-# Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-if [ "$RPI_MODEL" = 3 ] ; then
-  if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
-    echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
-    echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
-  fi
-fi
-
 # Create firmware configuration and cmdline symlinks
 ln -sf firmware/config.txt "${R}/boot/config.txt"
 ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
 
 # Install and setup kernel modules to load at boot
-mkdir -p "${R}/lib/modules-load.d/"
-install_readonly files/modules/rpi2.conf "${R}/lib/modules-load.d/rpi2.conf"
+mkdir -p "${LIB_DIR}/modules-load.d/"
+install_readonly files/modules/rpi2.conf "${LIB_DIR}/modules-load.d/rpi2.conf"
 
 # Load hardware random module at boot
 if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then
-  sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${R}/lib/modules-load.d/rpi2.conf"
+  sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${LIB_DIR}/modules-load.d/rpi2.conf"
 fi
 
 # Load sound module at boot
 if [ "$ENABLE_SOUND" = true ] ; then
-  sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${R}/lib/modules-load.d/rpi2.conf"
+  sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
 else
   echo "dtparam=audio=off" >> "${BOOT_DIR}/config.txt"
 fi
@@ -125,21 +203,21 @@ fi
 # Enable I2C interface
 if [ "$ENABLE_I2C" = true ] ; then
   echo "dtparam=i2c_arm=on" >> "${BOOT_DIR}/config.txt"
-  sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${R}/lib/modules-load.d/rpi2.conf"
-  sed -i "s/^# i2c-dev/i2c-dev/" "${R}/lib/modules-load.d/rpi2.conf"
+  sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${LIB_DIR}/modules-load.d/rpi2.conf"
+  sed -i "s/^# i2c-dev/i2c-dev/" "${LIB_DIR}/modules-load.d/rpi2.conf"
 fi
 
 # Enable SPI interface
 if [ "$ENABLE_SPI" = true ] ; then
   echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"
-  echo "spi-bcm2708" >> "${R}/lib/modules-load.d/rpi2.conf"
-  if [ "$RPI_MODEL" = 3 ] ; then
-    sed -i "s/spi-bcm2708/spi-bcm2835/" "${R}/lib/modules-load.d/rpi2.conf"
+  echo "spi-bcm2708" >> "${LIB_DIR}/modules-load.d/rpi2.conf"
+  if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
+    sed -i "s/spi-bcm2708/spi-bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
   fi
 fi
 
 # Disable RPi2/3 under-voltage warnings
-if [ ! -z "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
+if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
   echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
 fi
 
diff --git a/bootstrap.d/20-networking.sh b/bootstrap.d/20-networking.sh
index 57c72de..3aca05f 100644
--- a/bootstrap.d/20-networking.sh
+++ b/bootstrap.d/20-networking.sh
@@ -7,11 +7,11 @@
 
 # Install and setup hostname
 install_readonly files/network/hostname "${ETC_DIR}/hostname"
-sed -i "s/^rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hostname"
+sed -i "s/^RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hostname"
 
 # Install and setup hosts
 install_readonly files/network/hosts "${ETC_DIR}/hosts"
-sed -i "s/rpi2-jessie/${HOSTNAME}/" "${ETC_DIR}/hosts"
+sed -i "s/RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hosts"
 
 # Setup hostname entry with static IP
 if [ "$NET_ADDRESS" != "" ] ; then
@@ -65,13 +65,12 @@ sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/eth.network"
 sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/wlan.network"
 
 # Move systemd network configuration if required by Debian release
-if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-  mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
-	if [ "$ENABLE_WIRELESS" = true ] ; then
-	mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
-	fi
-  rm -fr "${ETC_DIR}/systemd/network"
+mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
+# If WLAN is enabled copy wlan configuration too
+if [ "$ENABLE_WIRELESS" = true ] ; then
+  mv -v "${ETC_DIR}/systemd/network/wlan.network" "${LIB_DIR}/systemd/network/11-wlan.network"
 fi
+rm -fr "${ETC_DIR}/systemd/network"
 
 # Enable systemd-networkd service
 chroot_exec systemctl enable systemd-networkd
@@ -89,14 +88,14 @@ if [ "$ENABLE_HARDNET" = true ] ; then
 fi
 
 # Enable time sync
-if [ "NET_NTP_1" != "" ] ; then
+if [ "$NET_NTP_1" != "" ] ; then
   chroot_exec systemctl enable systemd-timesyncd.service
 fi
 
 # Download the firmware binary blob required to use the RPi3 wireless interface
 if [ "$ENABLE_WIRELESS" = true ] ; then
-  if [ ! -d ${WLAN_FIRMWARE_DIR} ] ; then
-	mkdir -p ${WLAN_FIRMWARE_DIR}
+  if [ ! -d "${WLAN_FIRMWARE_DIR}" ] ; then
+    mkdir -p "${WLAN_FIRMWARE_DIR}"
   fi
 
   # Create temporary directory for firmware binary blob
@@ -104,31 +103,30 @@ if [ "$ENABLE_WIRELESS" = true ] ; then
 
   # Fetch firmware binary blob for RPI3B+
   if [ "$RPI_MODEL" = 3P ] ; then
-  as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
-  as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
-  as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
-  else
-  # Fetch firmware binary blob for RPI3
-  as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
-  as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
-  fi
-  
-  # Move downloaded firmware binary blob
-  if [ "$RPI_MODEL" = 3P ] ; then
-  mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
-  else
-  mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+    # Fetch firmware binary blob for RPi3P
+    as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
+    as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
+    as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
+	
+	# Move downloaded firmware binary blob
+	mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
+	
+	# Set permissions of the firmware binary blob
+	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
+  elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
+    # Fetch firmware binary blob for RPi3
+    as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
+    as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
+	
+	# Move downloaded firmware binary blob
+	mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
+	
+	# Set permissions of the firmware binary blob
+	chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
+    chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
   fi
   
   # Remove temporary directory for firmware binary blob
   rm -fr "${temp_dir}"
-
-  # Set permissions of the firmware binary blob
-  if [ "$RPI_MODEL" = 3P ] ; then
-  chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-  chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*  
-  else
-  chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-  chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
-  fi
 fi
diff --git a/bootstrap.d/21-firewall.sh b/bootstrap.d/21-firewall.sh
index cf36c99..e6033c4 100644
--- a/bootstrap.d/21-firewall.sh
+++ b/bootstrap.d/21-firewall.sh
@@ -8,7 +8,11 @@
 if [ "$ENABLE_IPTABLES" = true ] ; then
   # Create iptables configuration directory
   mkdir -p "${ETC_DIR}/iptables"
-
+  
+  # make sure iptables-legacy is the used alternatives 
+  #iptables-save and -restore are slaves of iptables and thus are set accordingly
+  chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
+  
   # Install iptables systemd service
   install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"
 
diff --git a/bootstrap.d/30-security.sh b/bootstrap.d/30-security.sh
index 8b0e464..8ad8275 100644
--- a/bootstrap.d/30-security.sh
+++ b/bootstrap.d/30-security.sh
@@ -6,13 +6,13 @@
 . ./functions.sh
 
 # Generate crypt(3) password string
-ENCRYPTED_PASSWORD=`mkpasswd -m sha-512 "${PASSWORD}"`
-ENCRYPTED_USER_PASSWORD=`mkpasswd -m sha-512 "${USER_PASSWORD}"`
+ENCRYPTED_PASSWORD=$(mkpasswd -m sha-512 "${PASSWORD}")
+ENCRYPTED_USER_PASSWORD=$(mkpasswd -m sha-512 "${USER_PASSWORD}")
 
 # Setup default user
 if [ "$ENABLE_USER" = true ] ; then
-  chroot_exec adduser --gecos $USER_NAME --add_extra_groups --disabled-password $USER_NAME
-  chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" $USER_NAME
+  chroot_exec adduser --gecos "$USER_NAME" --add_extra_groups --disabled-password "$USER_NAME"
+  chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" "$USER_NAME"
 fi
 
 # Setup root password or not
diff --git a/bootstrap.d/32-sshd.sh b/bootstrap.d/32-sshd.sh
index 162fdb2..9d28d51 100644
--- a/bootstrap.d/32-sshd.sh
+++ b/bootstrap.d/32-sshd.sh
@@ -28,7 +28,7 @@ if [ "$ENABLE_SSHD" = true ] ; then
     fi
 
     # Add SSH (v2) public key for user root
-    if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
+    if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
       # Create root SSH config directory
       mkdir -p "${R}/root/.ssh"
 
@@ -52,20 +52,20 @@ if [ "$ENABLE_SSHD" = true ] ; then
 
   if [ "$ENABLE_USER" = true ] ; then
     # Add SSH (v2) public key for user $USER_NAME
-    if [ ! -z "$SSH_USER_PUB_KEY" ] ; then
+    if [ -n "$SSH_USER_PUB_KEY" ] ; then
       # Create $USER_NAME SSH config directory
       mkdir -p "${R}/home/${USER_NAME}/.ssh"
 
       # Set permissions of $USER_NAME SSH config directory
       chroot_exec chmod 700 "/home/${USER_NAME}/.ssh"
-      chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh"
+      chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh"
 
       # Add SSH (v2) public key(s) to authorized_keys file
       cat "$SSH_USER_PUB_KEY" >> "${R}/home/${USER_NAME}/.ssh/authorized_keys"
 
       # Set permissions of $USER_NAME SSH config directory
       chroot_exec chmod 600 "/home/${USER_NAME}/.ssh/authorized_keys"
-      chroot_exec chown ${USER_NAME}:${USER_NAME} "/home/${USER_NAME}/.ssh/authorized_keys"
+      chroot_exec chown "${USER_NAME}":"${USER_NAME}" "/home/${USER_NAME}/.ssh/authorized_keys"
 
       if [ "$ENABLE_REDUCE" = false ] || [ "$REDUCE_SSHD" = false ] ; then
         # Allow SSH public key authentication
@@ -85,7 +85,7 @@ if [ "$ENABLE_SSHD" = true ] ; then
       allowed_users="${allowed_users} ${USER_NAME}"
     fi
 
-    if [ ! -z "$allowed_users" ] ; then
+    if [ -n "$allowed_users" ] ; then
       echo "AllowUsers ${allowed_users}" >> "${ETC_DIR}/ssh/sshd_config"
     fi
   fi
@@ -113,4 +113,4 @@ if [ "$ENABLE_SSHD" = true ] ; then
   if [ "$ENABLE_REDUCE" = true ] && [ "$REDUCE_SSHD" = true ] ; then
     sed "s|^DROPBEAR_EXTRA_ARGS=.*|DROPBEAR_EXTRA_ARGS=\"${DROPBEAR_ARGS}\"|g" "${ETC_DIR}/default/dropbear"
   fi
-fi
+fi
\ No newline at end of file
diff --git a/bootstrap.d/41-uboot.sh b/bootstrap.d/41-uboot.sh
index a7f4709..dded27d 100644
--- a/bootstrap.d/41-uboot.sh
+++ b/bootstrap.d/41-uboot.sh
@@ -32,7 +32,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
   fi
 
   # Build and install U-Boot inside chroot
-  chroot_exec make -j${KERNEL_THREADS} -C /tmp/u-boot/ ${UBOOT_CONFIG} all
+  chroot_exec make -j"${KERNEL_THREADS}" -C /tmp/u-boot/ "${UBOOT_CONFIG}" all
 
   # Copy compiled bootloader binary and set config.txt to load it
   install_exec "${R}/tmp/u-boot/tools/mkimage" "${R}/usr/sbin/mkimage"
@@ -41,7 +41,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
 
   # Install and setup U-Boot command file
   install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
-  printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+  printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
 
   if [ "$ENABLE_INITRAMFS" = true ] ; then
     # Convert generated initramfs for U-Boot using mkimage
@@ -51,7 +51,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
     rm -f "${BOOT_DIR}/initramfs-${KERNEL_VERSION}"
 
     # Configure U-Boot to load generated initramfs
-    printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
+    printf "# Set initramfs file\nsetenv initramfs initramfs-${KERNEL_VERSION}.uboot\n\n$(cat "${BOOT_DIR}"/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
     printf "\nbootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
   else # ENABLE_INITRAMFS=false
     # Remove initramfs from U-Boot mkfile
@@ -66,8 +66,20 @@ if [ "$ENABLE_UBOOT" = true ] ; then
     fi
   fi
 
+  if [ "$SET_ARCH" = 64 ] ; then
+    echo "Setting up config.txt to boot 64bit uboot"
+    {
+      printf "\n# 64bit-mode"
+      printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md"
+      printf "\narm_64bit=1"
+    } >> "${BOOT_DIR}/config.txt"
+    
+    #in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)]
+    sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
+  fi
+
   # Set mkfile to use the correct dtb file
-  sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage"
+  sed -i "s|bcm2709-rpi-2-b.dtb|${DTB_FILE}|" "${BOOT_DIR}/uboot.mkimage"
 
   # Set mkfile to use the correct mach id
   if [ "$ENABLE_QEMU" = true ] ; then
@@ -75,7 +87,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
   fi
 
   # Set mkfile to use kernel image
-  sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage"
+  sed -i "s|kernel7.img|${KERNEL_IMAGE}|" "${BOOT_DIR}/uboot.mkimage"
 
   # Remove all leading blank lines
   sed -i "/./,\$!d" "${BOOT_DIR}/uboot.mkimage"
diff --git a/bootstrap.d/42-fbturbo.sh b/bootstrap.d/42-fbturbo.sh
index 7c307af..0835552 100644
--- a/bootstrap.d/42-fbturbo.sh
+++ b/bootstrap.d/42-fbturbo.sh
@@ -28,11 +28,7 @@ if [ "$ENABLE_FBTURBO" = true ] ; then
   fi
 
   # Install Xorg build dependencies
-  if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-    chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-  fi
+  chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
 
   # Build and install fbturbo driver inside chroot
   chroot_exec /bin/bash -x <<'EOF'
diff --git a/bootstrap.d/43-videocore.sh b/bootstrap.d/43-videocore.sh
new file mode 100644
index 0000000..b8ff518
--- /dev/null
+++ b/bootstrap.d/43-videocore.sh
@@ -0,0 +1,53 @@
+#
+# Setup videocore - Raspberry Userland
+#
+
+# Load utility functions
+. ./functions.sh
+
+if [ "$ENABLE_VIDEOCORE" = true ] ; then
+  # Copy existing videocore sources into chroot directory
+  if [ -n "$VIDEOCORESRC_DIR" ] && [ -d "$VIDEOCORESRC_DIR" ] ; then
+    # Copy local videocore sources
+    cp -r "${VIDEOCORESRC_DIR}" "${R}/tmp/userland"
+  else
+    # Create temporary directory for videocore sources
+    temp_dir=$(as_nobody mktemp -d)
+
+    # Fetch videocore sources
+    as_nobody git -C "${temp_dir}" clone "${VIDEOCORE_URL}"
+
+    # Copy downloaded videocore sources
+    mv "${temp_dir}/userland" "${R}/tmp/"
+
+    # Set permissions of the U-Boot sources
+    chown -R root:root "${R}/tmp/userland"
+
+    # Remove temporary directory for U-Boot sources
+    rm -fr "${temp_dir}"
+  fi
+  
+  # Create build dir
+  mkdir "${R}"/tmp/userland/build
+
+  # push us to build directory
+  cd "${R}"/tmp/userland/build
+
+  if [ "$RELEASE_ARCH" = "arm64" ] ; then
+  cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
+  fi
+
+  if [ "$RELEASE_ARCH" = "armel" ] ; then
+  cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabi-g++ -DCMAKE_ASM_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DCMAKE_SYSTEM_PROCESSOR="arm" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
+  fi
+
+  if [ "$RELEASE_ARCH" = "armhf" ] ; then
+  cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland"
+  fi
+
+  #build userland
+  make -j "$(nproc)"
+
+  #back to root of scriptdir
+  cd "${WORKDIR}"
+fi
diff --git a/bootstrap.d/99-reduce.sh b/bootstrap.d/99-reduce.sh
index c339e0d..9576bd6 100644
--- a/bootstrap.d/99-reduce.sh
+++ b/bootstrap.d/99-reduce.sh
@@ -25,8 +25,8 @@ if [ "$ENABLE_REDUCE" = true ] ; then
 
   # Remove all doc files
   if [ "$REDUCE_DOC" = true ] ; then
-    find "${R}/usr/share/doc" -depth -type f ! -name copyright | xargs rm || true
-    find "${R}/usr/share/doc" -empty | xargs rmdir || true
+    find "${R}/usr/share/doc" -depth -type f ! -name copyright -print0 | xargs -0 rm || true
+    find "${R}/usr/share/doc" -empty -print0 | xargs -0 rmdir || true
   fi
 
   # Remove all man pages and info files
@@ -36,7 +36,7 @@ if [ "$ENABLE_REDUCE" = true ] ; then
 
   # Remove all locale translation files
   if [ "$REDUCE_LOCALE" = true ] ; then
-    find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' | xargs rm -r
+    find "${R}/usr/share/locale" -mindepth 1 -maxdepth 1 ! -name 'en' -print0 | xargs -0 rm -r
   fi
 
   # Remove hwdb PCI device classes (experimental)
@@ -46,12 +46,8 @@ if [ "$ENABLE_REDUCE" = true ] ; then
 
   # Replace bash shell by dash shell (experimental)
   if [ "$REDUCE_BASH" = true ] ; then
-    if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-      echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
-    else
-      echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --force-yes bash
-    fi
-
+    # Purge bash and update alternatives
+    echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
     chroot_exec update-alternatives --install /bin/bash bash /bin/dash 100
   fi
 
@@ -60,11 +56,6 @@ if [ "$ENABLE_REDUCE" = true ] ; then
     chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data
   fi
 
-  # Re-install tools for managing kernel modules
-  if [ "$RELEASE" = "jessie" ] ; then
-    chroot_exec apt-get -qq -y install module-init-tools
-  fi
-
   # Remove GPU kernels
   if [ "$ENABLE_MINGPU" = true ] ; then
     rm -f "${BOOT_DIR}/start.elf"
diff --git a/files/boot/uboot.mkimage b/files/boot/uboot.mkimage
index 6ce6500..13267f6 100644
--- a/files/boot/uboot.mkimage
+++ b/files/boot/uboot.mkimage
@@ -8,6 +8,7 @@ setenv machid 0x00000c42
 saveenv
 
 # Load the existing Linux kernel into RAM
+mmc dev 0
 fatload mmc 0:1 ${kernel_addr_r} kernel7.img
 fatload mmc 0:1 ${fdt_addr_r} ${dtbfile}
 fatload mmc 0:1 ${ramdisk_addr_r} ${initramfs}
diff --git a/files/etc/99-com.rules b/files/etc/99-com.rules
new file mode 100644
index 0000000..fd6621d
--- /dev/null
+++ b/files/etc/99-com.rules
@@ -0,0 +1,33 @@
+SUBSYSTEM=="input", GROUP="input", MODE="0660"
+SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660"
+SUBSYSTEM=="spidev", GROUP="spi", MODE="0660"
+SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660"
+
+SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
+SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\
+	chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\
+	chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\
+	chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\
+'"
+
+KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
+	ALIASES=/proc/device-tree/aliases; \
+	if cmp -s $ALIASES/uart0 $ALIASES/serial0; then \
+		echo 0;\
+	elif cmp -s $ALIASES/uart0 $ALIASES/serial1; then \
+		echo 1; \
+	else \
+		exit 1; \
+	fi\
+'", SYMLINK+="serial%c"
+
+KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
+	ALIASES=/proc/device-tree/aliases; \
+	if cmp -s $ALIASES/uart1 $ALIASES/serial0; then \
+		echo 0; \
+	elif cmp -s $ALIASES/uart1 $ALIASES/serial1; then \
+		echo 1; \
+	else \
+		exit 1; \
+	fi \
+'", SYMLINK+="serial%c"
diff --git a/files/iptables/ip6tables.service b/files/iptables/ip6tables.service
index bb1644f..c5a5a90 100644
--- a/files/iptables/ip6tables.service
+++ b/files/iptables/ip6tables.service
@@ -6,7 +6,7 @@ Before=sysinit.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStart=/sbin/ip6tables-restore -w 5 /etc/iptables/ip6tables.rules
 ExecReload=/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
 ExecStop=/etc/iptables/flush-ip6tables.sh
 RemainAfterExit=yes
diff --git a/files/iptables/iptables.service b/files/iptables/iptables.service
index f5a1e89..0d234aa 100644
--- a/files/iptables/iptables.service
+++ b/files/iptables/iptables.service
@@ -6,7 +6,7 @@ Before=sysinit.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules
+ExecStart=/sbin/iptables-restore -w 5 /etc/iptables/iptables.rules
 ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules
 ExecStop=/etc/iptables/flush-iptables.sh
 RemainAfterExit=yes
diff --git a/files/iptables/nftables.rules b/files/iptables/nftables.rules
new file mode 100644
index 0000000..6881564
--- /dev/null
+++ b/files/iptables/nftables.rules
@@ -0,0 +1,21 @@
+add table ip filter
+add chain ip filter INPUT { type filter hook input priority 0; }
+add chain ip filter FORWARD { type filter hook forward priority 0; }
+add chain ip filter OUTPUT { type filter hook output priority 0; }
+add chain ip filter TCP
+add chain ip filter UDP
+add chain ip filter SSH
+add rule ip filter INPUT icmp type echo-request limit rate 30/minute burst 8 packets counter accept
+add rule ip filter INPUT icmp type echo-request counter drop
+add rule ip filter INPUT ct state related,established counter accept
+add rule ip filter INPUT iifname lo counter accept
+add rule ip filter INPUT ct state invalid counter drop
+add rule ip filter INPUT tcp dport 22 ct state new counter jump SSH
+# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 3 --seconds 10 -j DROP 
+# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 20 --seconds 1800 -j DROP 
+# -t filter -A SSH -m recent --name sshbf --set -j ACCEPT 
+add rule ip filter INPUT ip protocol udp ct state new counter jump UDP
+add rule ip filter INPUT tcp flags & fin|syn|rst|ack == syn ct state new counter jump TCP
+add rule ip filter INPUT ip protocol udp counter reject
+add rule ip filter INPUT ip protocol tcp counter reject with tcp reset
+add rule ip filter INPUT counter reject with icmp type prot-unreachable
diff --git a/files/iptables/nftables6.rules b/files/iptables/nftables6.rules
new file mode 100644
index 0000000..38f1755
--- /dev/null
+++ b/files/iptables/nftables6.rules
@@ -0,0 +1,24 @@
+add table ip6 filter
+add chain ip6 filter INPUT { type filter hook input priority 0; }
+add chain ip6 filter FORWARD { type filter hook forward priority 0; }
+add chain ip6 filter OUTPUT { type filter hook output priority 0; }
+add chain ip6 filter TCP
+add chain ip6 filter UDP
+add chain ip6 filter SSH
+add rule ip6 filter INPUT rt type 0 counter drop
+add rule ip6 filter OUTPUT rt type 0 counter drop
+add rule ip6 filter FORWARD rt type 0 counter drop
+add rule ip6 filter INPUT meta l4proto ipv6-icmp icmpv6 type echo-request  limit rate 30/minute burst 8 packets counter accept
+add rule ip6 filter INPUT meta l4proto ipv6-icmp icmpv6 type echo-request  counter drop
+add rule ip6 filter INPUT ct state related,established counter accept
+add rule ip6 filter INPUT iifname lo counter accept
+add rule ip6 filter INPUT ct state invalid counter drop
+add rule ip6 filter INPUT tcp dport 22 ct state new counter jump SSH
+# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 3 --seconds 10 -j DROP 
+# -t filter -A SSH -m recent --name sshbf --rttl --rcheck --hitcount 20 --seconds 1800 -j DROP 
+# -t filter -A SSH -m recent --name sshbf --set -j ACCEPT 
+add rule ip6 filter INPUT meta l4proto udp ct state new counter jump UDP
+add rule ip6 filter INPUT tcp flags & fin|syn|rst|ack == syn ct state new counter jump TCP
+add rule ip6 filter INPUT meta l4proto udp counter reject with icmpv6 type admin-prohibited
+add rule ip6 filter INPUT meta l4proto tcp counter reject with icmpv6 type admin-prohibited
+add rule ip6 filter INPUT counter reject with icmpv6 type admin-prohibited
diff --git a/files/network/hostname b/files/network/hostname
index 03a61be..b20bbc3 100644
--- a/files/network/hostname
+++ b/files/network/hostname
@@ -1 +1 @@
-rpi2-jessie
+RaspberryPI
diff --git a/files/network/hosts b/files/network/hosts
index 360cae7..3ae0878 100644
--- a/files/network/hosts
+++ b/files/network/hosts
@@ -1,5 +1,5 @@
 127.0.0.1       localhost
-127.0.1.1       rpi2-jessie
+127.0.1.1       RaspberryPI
 
 ::1             localhost ip6-localhost ip6-loopback
 ff02::1         ip6-allnodes
diff --git a/files/sysctl.d/83-rpi-printk.conf b/files/sysctl.d/83-rpi-printk.conf
new file mode 100644
index 0000000..f8948fb
--- /dev/null
+++ b/files/sysctl.d/83-rpi-printk.conf
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3
\ No newline at end of file
diff --git a/functions.sh b/functions.sh
index 9d36455..74ca846 100644
--- a/functions.sh
+++ b/functions.sh
@@ -30,22 +30,22 @@ cleanup (){
 
 chroot_exec() {
   # Exec command in chroot
-  LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot ${R} $*
+  LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot "${R}" "$@"
 }
 
 as_nobody() {
   # Exec command as user nobody
-  sudo -E -u nobody LANG=C LC_ALL=C $*
+  sudo -E -u nobody LANG=C LC_ALL=C "$@"
 }
 
 install_readonly() {
   # Install file with user read-only permissions
-  install -o root -g root -m 644 $*
+  install -o root -g root -m 644 "$@"
 }
 
 install_exec() {
   # Install file with root exec permissions
-  install -o root -g root -m 744 $*
+  install -o root -g root -m 744 "$@"
 }
 
 use_template () {
@@ -63,19 +63,15 @@ chroot_install_cc() {
   # Install c/c++ build environment inside the chroot
   if [ -z "${COMPILER_PACKAGES}" ] ; then
     COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
-
-    if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-      chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-    elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-      chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
-    fi
+	# Install COMPILER_PACKAGES in chroot
+    chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install "${COMPILER_PACKAGES}"
   fi
 }
 
 chroot_remove_cc() {
   # Remove c/c++ build environment from the chroot
-  if [ ! -z "${COMPILER_PACKAGES}" ] ; then
-    chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
+  if [ -n "${COMPILER_PACKAGES}" ] ; then
+    chroot_exec apt-get -qq -y --auto-remove purge "${COMPILER_PACKAGES}"
     COMPILER_PACKAGES=""
   fi
 }
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index d8d008a..575252a 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
-
 ########################################################################
 # rpi23-gen-image.sh					       2015-2017
 #
-# Advanced Debian "jessie", "stretch" and "buster" bootstrap script for RPi2/3
+# Advanced Debian "stretch" and "buster" bootstrap script for Raspberry Pi
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -31,69 +30,22 @@ fi
 . ./functions.sh
 
 # Load parameters from configuration template file
-if [ ! -z "$CONFIG_TEMPLATE" ] ; then
+if [ -n "$CONFIG_TEMPLATE" ] ; then
   use_template
 fi
 
 # Introduce settings
 set -e
-echo -n -e "\n#\n# RPi2/3 Bootstrap Settings\n#\n"
+echo -n -e "\n#\n# RPi 0/1/2/3 Bootstrap Settings\n#\n"
 set -x
 
 # Raspberry Pi model configuration
 RPI_MODEL=${RPI_MODEL:=2}
 
-#bcm2708-rpi-0-w.dtb (Used for Pi 0 and PI 0W)
-RPI0_DTB_FILE=${RPI0_DTB_FILE:=bcm2708-rpi-0-w.dtb}
-RPI0_UBOOT_CONFIG=${RPI0_UBOOT_CONFIG:=rpi_defconfig}
-
-#bcm2708-rpi-b.dtb (Used for Pi 1 model A and B)
-RPI1_DTB_FILE=${RPI1_DTB_FILE:=bcm2708-rpi-b.dtb}
-RPI1_UBOOT_CONFIG=${RPI1_UBOOT_CONFIG:=rpi_defconfig}
-
-#bcm2708-rpi-b-plus.dtb (Used for Pi 1 model B+ and A+)
-RPI1P_DTB_FILE=${RPI1P_DTB_FILE:=bcm2708-rpi-b-plus.dtb}
-RPI1P_UBOOT_CONFIG=${RPI1P_UBOOT_CONFIG:=rpi_defconfig}
-
-#bcm2709-rpi-2-b.dtb (Used for Pi 2 model B)
-RPI2_DTB_FILE=${RPI2_DTB_FILE:=bcm2709-rpi-2-b.dtb}
-RPI2_UBOOT_CONFIG=${RPI2_UBOOT_CONFIG:=rpi_2_defconfig}
-
-#bcm2710-rpi-3-b.dtb (Used for Pi 3 model B)
-RPI3_DTB_FILE=${RPI3_DTB_FILE:=bcm2710-rpi-3-b.dtb}
-RPI3_UBOOT_CONFIG=${RPI3_UBOOT_CONFIG:=rpi_3_32b_defconfig}
-
-#bcm2710-rpi-3-b-plus.dtb (Used for Pi 3 model B+)
-RPI3P_DTB_FILE=${RPI3P_DTB_FILE:=bcm2710-rpi-3-b-plus.dtb}
-RPI3P_UBOOT_CONFIG=${RPI3P_UBOOT_CONFIG:=rpi_3_32b_defconfig}
-
 # Debian release
-RELEASE=${RELEASE:=jessie}
-KERNEL_ARCH=${KERNEL_ARCH:=arm}
-RELEASE_ARCH=${RELEASE_ARCH:=armhf}
-CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
-COLLABORA_KERNEL=${COLLABORA_KERNEL:=3.18.0-trunk-rpi2}
-if [ "$KERNEL_ARCH" = "arm64" ] ; then
-  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
-  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
-fi
-
-if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
-#RASPBERRY PI 1, PI ZERO, PI ZERO W, AND COMPUTE MODULE DEFAULT Kernel BUILD CONFIGURATION
-  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
-  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
-else
-#RASPBERRY PI 2, PI 3, PI 3+, AND COMPUTE MODULE 3 DEFAULT Kernel BUILD CONFIGURATION
-#https://www.raspberrypi.org/documentation/linux/kernel/building.md
-  KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
-  KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
-fi
+RELEASE=${RELEASE:=buster}
 
-if [ "$RELEASE_ARCH" = "arm64" ] ; then
-  QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
-else
-  QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
-fi
+# Kernel Branch
 KERNEL_BRANCH=${KERNEL_BRANCH:=""}
 
 # URLs
@@ -103,31 +55,28 @@ WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-no
 COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
 FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
 UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
+VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
+BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
 
 # Build directories
-BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
+WORKDIR=$(pwd)
+BASEDIR=${BASEDIR:=${WORKDIR}/images/${RELEASE}}
 BUILDDIR="${BASEDIR}/build"
 
-# Prepare date string for default image file name
-DATE="$(date +%Y-%m-%d)"
-if [ -z "$KERNEL_BRANCH" ] ; then
-  IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-else
-  IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
-fi
-
 # Chroot directories
 R="${BUILDDIR}/chroot"
 ETC_DIR="${R}/etc"
 LIB_DIR="${R}/lib"
 BOOT_DIR="${R}/boot/firmware"
 KERNEL_DIR="${R}/usr/src/linux"
-WLAN_FIRMWARE_DIR="${R}/lib/firmware/brcm"
+WLAN_FIRMWARE_DIR="${LIB_DIR}/firmware/brcm"
+BLUETOOTH_FIRMWARE_DIR="${ETC_DIR}/firmware/bt"
 
 # Firmware directory: Blank if download from github
 RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}
 
 # General settings
+SET_ARCH=${SET_ARCH:=32}
 HOSTNAME=${HOSTNAME:=rpi${RPI_MODEL}-${RELEASE}}
 PASSWORD=${PASSWORD:=raspberry}
 USER_PASSWORD=${USER_PASSWORD:=raspberry}
@@ -158,6 +107,9 @@ APT_PROXY=${APT_PROXY:=""}
 APT_SERVER=${APT_SERVER:="ftp.debian.org"}
 
 # Feature settings
+ENABLE_PRINTK=${ENABLE_PRINTK:=false}
+ENABLE_BLUETOOTH=${ENABLE_BLUETOOTH:=false}
+ENABLE_MINIUART_OVERLAY=${ENABLE_MINIUART_OVERLAY:=false}
 ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
 ENABLE_I2C=${ENABLE_I2C:=false}
 ENABLE_SPI=${ENABLE_SPI:=false}
@@ -176,6 +128,7 @@ ENABLE_USER=${ENABLE_USER:=true}
 USER_NAME=${USER_NAME:="pi"}
 ENABLE_ROOT=${ENABLE_ROOT:=false}
 ENABLE_QEMU=${ENABLE_QEMU:=false}
+ENABLE_SYSVINIT=${ENABLE_SYSVINIT:=false}
 
 # SSH settings
 SSH_ENABLE_ROOT=${SSH_ENABLE_ROOT:=false}
@@ -190,6 +143,8 @@ ENABLE_REDUCE=${ENABLE_REDUCE:=false}
 ENABLE_UBOOT=${ENABLE_UBOOT:=false}
 UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
 ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
+ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
+VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
 FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
 ENABLE_HARDNET=${ENABLE_HARDNET:=false}
 ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
@@ -199,7 +154,7 @@ ENABLE_IFNAMES=${ENABLE_IFNAMES:=true}
 DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=}
 
 # Kernel compilation settings
-BUILD_KERNEL=${BUILD_KERNEL:=false}
+BUILD_KERNEL=${BUILD_KERNEL:=true}
 KERNEL_REDUCE=${KERNEL_REDUCE:=false}
 KERNEL_THREADS=${KERNEL_THREADS:=1}
 KERNEL_HEADERS=${KERNEL_HEADERS:=true}
@@ -208,12 +163,6 @@ KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
 KERNEL_OLDDEFCONFIG=${KERNEL_OLDDEFCONFIG:=false}
 KERNEL_CCACHE=${KERNEL_CCACHE:=false}
 
-if [ "$KERNEL_ARCH" = "arm64" ] ; then
-  KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
-else
-  KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-fi
-
 # Kernel compilation from source directory settings
 KERNELSRC_DIR=${KERNELSRC_DIR:=""}
 KERNELSRC_CLEAN=${KERNELSRC_CLEAN:=false}
@@ -242,7 +191,10 @@ CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
 
 # Packages required in the chroot build environment
 APT_INCLUDES=${APT_INCLUDES:=""}
-APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd"
+
+# Packages to exclude from chroot build environment
+APT_EXCLUDES=${APT_EXCLUDES:=""}
 
 # Packages required for bootstrapping
 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
@@ -253,68 +205,134 @@ COMPILER_PACKAGES=""
 
 set +x
 
-# Set Raspberry Pi model specific configuration
-if [ "$RPI_MODEL" = 0 ] ; then
-  DTB_FILE=${RPI0_DTB_FILE}
-  UBOOT_CONFIG=${RPI0_UBOOT_CONFIG}
-elif [ "$RPI_MODEL" = 1 ] ; then
-  DTB_FILE=${RPI1_DTB_FILE}
-  UBOOT_CONFIG=${RPI1_UBOOT_CONFIG}
-elif [ "$RPI_MODEL" = 1P ] ; then
-  DTB_FILE=${RPI1P_DTB_FILE}
-  UBOOT_CONFIG=${RPI1P_UBOOT_CONFIG}
-elif [ "$RPI_MODEL" = 2 ] ; then
-  DTB_FILE=${RPI2_DTB_FILE}
-  UBOOT_CONFIG=${RPI2_UBOOT_CONFIG}
-elif [ "$RPI_MODEL" = 3 ] ; then
-  DTB_FILE=${RPI3_DTB_FILE}
-  UBOOT_CONFIG=${RPI3_UBOOT_CONFIG}
-elif [ "$RPI_MODEL" = 3P ] ; then
-  DTB_FILE=${RPI3P_DTB_FILE}
-  UBOOT_CONFIG=${RPI3P_UBOOT_CONFIG}
-else
-  echo "error: Raspberry Pi model ${RPI_MODEL} is not supported!"
-  exit 1
+#Check if apt-cacher-ng has port 3142 open and set APT_PROXY
+APT_CACHER_RUNNING=$(lsof -i :3142 | grep apt-cacher-ng |  cut -d ' ' -f3 | uniq)
+if [ -n "${APT_CACHER_RUNNING}" ] ; then
+  APT_PROXY=http://127.0.0.1:3142/
 fi
 
-# Check if the internal wireless interface is supported by the RPi model
-if [ "$ENABLE_WIRELESS" = true ] && ([ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] || [ "$RPI_MODEL" = 2 ]); then
+# Setup architecture specific settings
+if [ -n "$SET_ARCH" ] ; then
+  # 64-bit configuration
+  if [ "$SET_ARCH" = 64 ] ; then
+    # General 64-bit depended settings
+    QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
+    KERNEL_ARCH=${KERNEL_ARCH:=arm64}
+    KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+
+    # Raspberry Pi model specific settings
+    if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
+      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
+      RELEASE_ARCH=${RELEASE_ARCH:=arm64}
+      KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
+      CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
+    else
+      echo "error: Only Raspberry PI 3 and 3B+ support 64-bit"
+      exit 1
+    fi
+  fi
+
+  # 32-bit configuration
+  if [ "$SET_ARCH" = 32 ] ; then
+    # General 32-bit dependend settings
+    QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
+    KERNEL_ARCH=${KERNEL_ARCH:=arm}
+    KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
+
+    # Raspberry Pi model specific settings
+    if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
+      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
+      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
+      RELEASE_ARCH=${RELEASE_ARCH:=armel}
+      KERNEL_IMAGE=${KERNEL_IMAGE:=kernel.img}
+      CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabi-}
+    fi
 
-  echo "error: The selected Raspberry Pi model has no internal wireless interface"
+    # Raspberry Pi model specific settings
+    if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
+      KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
+      RELEASE_ARCH=${RELEASE_ARCH:=armhf}
+      KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
+      CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
+    fi
+  fi
+#SET_ARCH not set
+else
+  echo "error: Please set '32' or '64' as value for SET_ARCH"
   exit 1
-fi  
+fi
+# Device specific configuration and U-Boot configuration
+case "$RPI_MODEL" in
+  0)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-0-w.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  1)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  1P)
+    DTB_FILE=${DTB_FILE:=bcm2708-rpi-b-plus.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_defconfig}
+    ;;
+  2)
+    DTB_FILE=${DTB_FILE:=bcm2709-rpi-2-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_2_defconfig}
+    ;;
+  3)
+    DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+    ;;
+  3P)
+    DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
+    UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
+    ;;
+  *)
+    echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
+    exit 1
+    ;;
+esac
+
+# Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
+if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+  # Include bluetooth packages on supported boards
+  if [ "$ENABLE_BLUETOOTH" = true ] && [ "$ENABLE_CONSOLE" = false ]; then
+    APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+  fi
+else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+  # Check if the internal wireless interface is not supported by the RPi model
+  if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
+    echo "error: The selected Raspberry Pi model has no integrated interface for wireless or bluetooth"
+    exit 1
+  fi
+fi
+
+# Prepare date string for default image file name
+DATE="$(date +%Y-%m-%d)"
+if [ -z "$KERNEL_BRANCH" ] ; then
+  IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+else
+  IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+fi
 
 # Check if DISABLE_UNDERVOLT_WARNINGS parameter value is supported
-if [ ! -z "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
+if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
   if [ "$DISABLE_UNDERVOLT_WARNINGS" != 1 ] && [ "$DISABLE_UNDERVOLT_WARNINGS" != 2 ] ; then
     echo "error: DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS} is not supported"
     exit 1
   fi
 fi
 
-# Build RPi2/3 Linux kernel if required by Debian release
-if [ "$RELEASE" = "stretch" ]  || [ "$RELEASE" = "buster" ] ; then
-  BUILD_KERNEL=true
-fi
-
-# Add packages required for kernel cross compilation
-if [ "$BUILD_KERNEL" = true ] ; then
-  if [ "$KERNEL_ARCH" = "arm" ] ; then
-    if [ "$RELEASE_ARCH" = "armel" ]; then
-      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
-    fi
-    if [ "$RELEASE_ARCH" = "armhf" ]; then
-      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
-    fi
-    if [ "$RELEASE_ARCH" = "arm64" ]; then
-      REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
-    fi
-  fi
+# Add cmake to compile videocore sources
+if [ "$ENABLE_VIDEOCORE" = true ] ; then
+  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cmake"
 fi
 
 # Add libncurses5 to enable kernel menuconfig
 if [ "$KERNEL_MENUCONFIG" = true ] ; then
-  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libncurses5-dev"
+  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libncurses-dev"
 fi
 
 # Add ccache compiler cache for (faster) kernel cross (re)compilation
@@ -341,11 +359,19 @@ fi
 
 # Add device-tree-compiler required for building the U-Boot bootloader
 if [ "$ENABLE_UBOOT" = true ] ; then
-  APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex"
+  APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
+fi
+
+if [ "$ENABLE_BLUETOOTH" = true ] ; then
+  if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+    if [ "$ENABLE_CONSOLE" = false ] ; then
+	  APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
+	fi
+  fi
 fi
 
 # Check if root SSH (v2) public key file exists
-if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
+if [ -n "$SSH_ROOT_PUB_KEY" ] ; then
   if [ ! -f "$SSH_ROOT_PUB_KEY" ] ; then
     echo "error: '$SSH_ROOT_PUB_KEY' specified SSH public key file not found (SSH_ROOT_PUB_KEY)!"
     exit 1
@@ -353,7 +379,7 @@ if [ ! -z "$SSH_ROOT_PUB_KEY" ] ; then
 fi
 
 # Check if $USER_NAME SSH (v2) public key file exists
-if [ ! -z "$SSH_USER_PUB_KEY" ] ; then
+if [ -n "$SSH_USER_PUB_KEY" ] ; then
   if [ ! -f "$SSH_USER_PUB_KEY" ] ; then
     echo "error: '$SSH_USER_PUB_KEY' specified SSH public key file not found (SSH_USER_PUB_KEY)!"
     exit 1
@@ -362,7 +388,7 @@ fi
 
 # Check if all required packages are installed on the build system
 for package in $REQUIRED_PACKAGES ; do
-  if [ "`dpkg-query -W -f='${Status}' $package`" != "install ok installed" ] ; then
+  if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then
     MISSING_PACKAGES="${MISSING_PACKAGES} $package"
   fi
 done
@@ -372,12 +398,12 @@ if [ -n "$MISSING_PACKAGES" ] ; then
   echo "the following packages needed by this script are not installed:"
   echo "$MISSING_PACKAGES"
 
-  echo -n "\ndo you want to install the missing packages right now? [y/n] "
-  read confirm
+  printf "\ndo you want to install the missing packages right now? [y/n] "
+  read -r confirm
   [ "$confirm" != "y" ] && exit 1
 
   # Make sure all missing required packages are installed
-  apt-get -qq -y install ${MISSING_PACKAGES}
+  apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
 fi
 
 # Check if ./bootstrap.d directory exists
@@ -404,6 +430,12 @@ if [ -n "$UBOOTSRC_DIR" ] && [ ! -d "$UBOOTSRC_DIR" ] ; then
   exit 1
 fi
 
+# Check if specified VIDEOCORESRC_DIR directory exists
+if [ -n "$VIDEOCORESRC_DIR" ] && [ ! -d "$VIDEOCORESRC_DIR" ] ; then
+  echo "error: '${VIDEOCORESRC_DIR}' specified directory not found (VIDEOCORESRC_DIR)!"
+  exit 1
+fi
+
 # Check if specified FBTURBOSRC_DIR directory exists
 if [ -n "$FBTURBOSRC_DIR" ] && [ ! -d "$FBTURBOSRC_DIR" ] ; then
   echo "error: '${FBTURBOSRC_DIR}' specified directory not found (FBTURBOSRC_DIR)!"
@@ -432,7 +464,7 @@ fi
 mkdir -p "${R}"
 
 # Check if build directory has enough of free disk space >512MB
-if [ "$(df --output=avail ${BUILDDIR} | sed "1d")" -le "524288" ] ; then
+if [ "$(df --output=avail "${BUILDDIR}" | sed "1d")" -le "524288" ] ; then
   echo "error: ${BUILDDIR} not enough space left to generate the output image!"
   exit 1
 fi
@@ -447,11 +479,6 @@ if [ "$ENABLE_MINBASE" = true ] ; then
   APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools,ifupdown"
 fi
 
-# Add required locales packages
-if [ "$DEFLOCAL" != "en_US.UTF-8" ] ; then
-  APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
-fi
-
 # Add parted package, required to get partprobe utility
 if [ "$EXPANDROOT" = true ] ; then
   APT_INCLUDES="${APT_INCLUDES},parted"
@@ -464,7 +491,7 @@ fi
 
 # Add iptables IPv4/IPv6 package
 if [ "$ENABLE_IPTABLES" = true ] ; then
-  APT_INCLUDES="${APT_INCLUDES},iptables"
+  APT_INCLUDES="${APT_INCLUDES},iptables,iptables-persistent"
 fi
 
 # Add openssh server package
@@ -510,12 +537,23 @@ if [ "$ENABLE_REDUCE" = true ] ; then
 
   # Add dropbear package instead of openssh-server
   if [ "$REDUCE_SSHD" = true ] ; then
-    APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/openssh-server/dropbear/")"
+    APT_INCLUDES="$(echo "${APT_INCLUDES}" | sed "s/openssh-server/dropbear/")"
   fi
 fi
 
-if [ "$RELEASE" != "jessie" ] ; then
-  APT_INCLUDES="${APT_INCLUDES},libnss-systemd"
+# Configure systemd-sysv exclude to make halt/reboot/shutdown scripts available
+if [ "$ENABLE_SYSVINIT" = false ] ; then
+  APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
+fi
+
+# Check if kernel is getting compiled
+if [ "$BUILD_KERNEL" = false ] ; then
+  echo "Downloading precompiled kernel"
+  echo "error: not configured"
+  exit 1;
+# BUILD_KERNEL=true
+else
+  echo "No precompiled kernel repositories were added"
 fi
 
 # Configure kernel sources if no KERNELSRC_DIR
@@ -567,11 +605,6 @@ fi
 # Remove c/c++ build environment from the chroot
 chroot_remove_cc
 
-# Remove apt-utils
-if [ "$RELEASE" = "jessie" ] ; then
-  chroot_exec apt-get purge -qq -y --force-yes apt-utils
-fi
-
 # Generate required machine-id
 MACHINE_ID=$(dbus-uuidgen)
 echo -n "${MACHINE_ID}" > "${R}/var/lib/dbus/machine-id"
@@ -653,27 +686,27 @@ if [ "$ENABLE_QEMU" = true ] ; then
 fi
 
 # Calculate size of the chroot directory in KB
-CHROOT_SIZE=$(expr `du -s "${R}" | awk '{ print $1 }'`)
+CHROOT_SIZE=$(expr "$(du -s "${R}" | awk '{ print $1 }')")
 
 # Calculate the amount of needed 512 Byte sectors
 TABLE_SECTORS=$(expr 1 \* 1024 \* 1024 \/ 512)
 FRMW_SECTORS=$(expr 64 \* 1024 \* 1024 \/ 512)
-ROOT_OFFSET=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS})
+ROOT_OFFSET=$(expr "${TABLE_SECTORS}" + "${FRMW_SECTORS}")
 
 # The root partition is EXT4
 # This means more space than the actual used space of the chroot is used.
 # As overhead for journaling and reserved blocks 35% are added.
-ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 35) \* 1024 \/ 512)
+ROOT_SECTORS=$(expr "$(expr "${CHROOT_SIZE}" + "${CHROOT_SIZE}" \/ 100 \* 35)" \* 1024 \/ 512)
 
 # Calculate required image size in 512 Byte sectors
-IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS})
+IMAGE_SECTORS=$(expr "${TABLE_SECTORS}" + "${FRMW_SECTORS}" + "${ROOT_SECTORS}")
 
 # Prepare image file
 if [ "$ENABLE_SPLITFS" = true ] ; then
-  dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=${TABLE_SECTORS}
-  dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=0 seek=${FRMW_SECTORS}
-  dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=${TABLE_SECTORS}
-  dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek=${ROOT_SECTORS}
+  dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count="${TABLE_SECTORS}"
+  dd if=/dev/zero of="$IMAGE_NAME-frmw.img" bs=512 count=0 seek="${FRMW_SECTORS}"
+  dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count="${TABLE_SECTORS}"
+  dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek="${ROOT_SECTORS}"
 
   # Write firmware/boot partition tables
   sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
@@ -686,11 +719,11 @@ ${TABLE_SECTORS},${ROOT_SECTORS},83
 EOM
 
   # Setup temporary loop devices
-  FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $IMAGE_NAME-frmw.img)"
-  ROOT_LOOP="$(losetup -o 1M -f --show $IMAGE_NAME-root.img)"
+  FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME"-frmw.img)"
+  ROOT_LOOP="$(losetup -o 1M -f --show "$IMAGE_NAME"-root.img)"
 else # ENABLE_SPLITFS=false
-  dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=${TABLE_SECTORS}
-  dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek=${IMAGE_SECTORS}
+  dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count="${TABLE_SECTORS}"
+  dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek="${IMAGE_SECTORS}"
 
   # Write partition table
   sfdisk -q -L -uS -f "$IMAGE_NAME.img" 2> /dev/null <<EOM
@@ -699,8 +732,8 @@ ${ROOT_OFFSET},${ROOT_SECTORS},83
 EOM
 
   # Setup temporary loop devices
-  FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show $IMAGE_NAME.img)"
-  ROOT_LOOP="$(losetup -o 65M -f --show $IMAGE_NAME.img)"
+  FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME".img)"
+  ROOT_LOOP="$(losetup -o 65M -f --show "$IMAGE_NAME".img)"
 fi
 
 if [ "$ENABLE_CRYPTFS" = true ] ; then
@@ -725,7 +758,7 @@ if [ "$ENABLE_CRYPTFS" = true ] ; then
   ROOT_LOOP="/dev/mapper/${CRYPTFS_MAPPING}"
 
   # Wipe encrypted partition (encryption cipher is used for randomness)
-  dd if=/dev/zero of="${ROOT_LOOP}" bs=512 count=$(blockdev --getsz "${ROOT_LOOP}")
+  dd if=/dev/zero of="${ROOT_LOOP}" bs=512 count="$(blockdev --getsz "${ROOT_LOOP}")"
 fi
 
 # Build filesystems
@@ -752,22 +785,22 @@ if [ "$ENABLE_SPLITFS" = true ] ; then
   bmaptool create -o "$IMAGE_NAME-root.bmap" "$IMAGE_NAME-root.img"
 
   # Image was successfully created
-  echo "$IMAGE_NAME-frmw.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
-  echo "$IMAGE_NAME-root.img ($(expr \( ${TABLE_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+  echo "$IMAGE_NAME-frmw.img ($(expr \( "${TABLE_SECTORS}" + "${FRMW_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+  echo "$IMAGE_NAME-root.img ($(expr \( "${TABLE_SECTORS}" + "${ROOT_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
 else
   # Create block map file for "bmaptool"
   bmaptool create -o "$IMAGE_NAME.bmap" "$IMAGE_NAME.img"
 
   # Image was successfully created
-  echo "$IMAGE_NAME.img ($(expr \( ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS} \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
+  echo "$IMAGE_NAME.img ($(expr \( "${TABLE_SECTORS}" + "${FRMW_SECTORS}" + "${ROOT_SECTORS}" \) \* 512 \/ 1024 \/ 1024)M)" ": successfully created"
 
   # Create qemu qcow2 image
   if [ "$ENABLE_QEMU" = true ] ; then
     QEMU_IMAGE=${QEMU_IMAGE:=${BASEDIR}/qemu/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
     QEMU_SIZE=16G
 
-    qemu-img convert -f raw -O qcow2 $IMAGE_NAME.img $QEMU_IMAGE.qcow2
-    qemu-img resize $QEMU_IMAGE.qcow2 $QEMU_SIZE
+    qemu-img convert -f raw -O qcow2 "$IMAGE_NAME".img "$QEMU_IMAGE".qcow2
+    qemu-img resize "$QEMU_IMAGE".qcow2 $QEMU_SIZE
 
     echo "$QEMU_IMAGE.qcow2 ($QEMU_SIZE)" ": successfully created"
   fi
diff --git a/templates/rpi0buster b/templates/rpi0buster
new file mode 100644
index 0000000..3300983
--- /dev/null
+++ b/templates/rpi0buster
@@ -0,0 +1,5 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=0
+RELEASE=buster
+BUILD_KERNEL=true
+# ENABLE_BLUETOOTH=false
diff --git a/templates/rpi0stretch b/templates/rpi0stretch
new file mode 100644
index 0000000..6c47d50
--- /dev/null
+++ b/templates/rpi0stretch
@@ -0,0 +1,5 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=0
+RELEASE=stretch
+BUILD_KERNEL=true
+# ENABLE_BLUETOOTH=false
diff --git a/templates/rpi1Pbuster b/templates/rpi1Pbuster
new file mode 100644
index 0000000..c1e846f
--- /dev/null
+++ b/templates/rpi1Pbuster
@@ -0,0 +1,4 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=1P
+RELEASE=buster
+BUILD_KERNEL=true
diff --git a/templates/rpi1Pstretch b/templates/rpi1Pstretch
new file mode 100644
index 0000000..209107d
--- /dev/null
+++ b/templates/rpi1Pstretch
@@ -0,0 +1,4 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=1P
+RELEASE=stretch
+BUILD_KERNEL=true
diff --git a/templates/rpi3jessie b/templates/rpi1buster
similarity index 75%
rename from templates/rpi3jessie
rename to templates/rpi1buster
index 6a4f72f..b365f59 100644
--- a/templates/rpi3jessie
+++ b/templates/rpi1buster
@@ -1,4 +1,4 @@
 # Configuration template file used by rpi23-gen-image.sh
 RPI_MODEL=3
-RELEASE=jessie
+RELEASE=buster
 BUILD_KERNEL=true
diff --git a/templates/rpi1stretch b/templates/rpi1stretch
new file mode 100644
index 0000000..735dea2
--- /dev/null
+++ b/templates/rpi1stretch
@@ -0,0 +1,4 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=2
+RELEASE=stretch
+BUILD_KERNEL=true
diff --git a/templates/rpi2jessie b/templates/rpi2jessie
deleted file mode 100644
index c4d27dd..0000000
--- a/templates/rpi2jessie
+++ /dev/null
@@ -1,2 +0,0 @@
-# Configuration template file used by rpi23-gen-image.sh
-RELEASE=jessie
diff --git a/templates/rpi2stretch b/templates/rpi2stretch
index a67c72f..735dea2 100644
--- a/templates/rpi2stretch
+++ b/templates/rpi2stretch
@@ -1,3 +1,4 @@
 # Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=2
 RELEASE=stretch
 BUILD_KERNEL=true
diff --git a/templates/rpi3-stretch-arm64-4.11.y b/templates/rpi3-stretch-arm64-4.14.y
similarity index 92%
rename from templates/rpi3-stretch-arm64-4.11.y
rename to templates/rpi3-stretch-arm64-4.14.y
index 0523a0b..0c5cfaf 100644
--- a/templates/rpi3-stretch-arm64-4.11.y
+++ b/templates/rpi3-stretch-arm64-4.14.y
@@ -11,5 +11,5 @@ QEMU_BINARY=/usr/bin/qemu-aarch64-static
 KERNEL_DEFCONFIG=bcmrpi3_defconfig
 KERNEL_BIN_IMAGE=Image
 KERNEL_IMAGE=kernel8.img
-KERNEL_BRANCH=rpi-4.11.y
+KERNEL_BRANCH=rpi-4.14.y
 ENABLE_WIRELESS=true
diff --git a/templates/rpi3Pbuster b/templates/rpi3Pbuster
new file mode 100644
index 0000000..8f308de
--- /dev/null
+++ b/templates/rpi3Pbuster
@@ -0,0 +1,6 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=3P
+RELEASE=buster
+BUILD_KERNEL=true
+# ENABLE_WIRELESS=false
+# ENABLE_BLUETOOTH=false
diff --git a/templates/rpi3Pstretch b/templates/rpi3Pstretch
new file mode 100644
index 0000000..904535e
--- /dev/null
+++ b/templates/rpi3Pstretch
@@ -0,0 +1,6 @@
+# Configuration template file used by rpi23-gen-image.sh
+RPI_MODEL=3P
+RELEASE=stretch
+BUILD_KERNEL=true
+# ENABLE_WIRELESS=false
+# ENABLE_BLUETOOTH=false
diff --git a/templates/rpi3buster b/templates/rpi3buster
index b365f59..cc0dc1e 100644
--- a/templates/rpi3buster
+++ b/templates/rpi3buster
@@ -2,3 +2,5 @@
 RPI_MODEL=3
 RELEASE=buster
 BUILD_KERNEL=true
+# ENABLE_WIRELESS=false
+# ENABLE_BLUETOOTH=false
diff --git a/templates/rpi3stretch b/templates/rpi3stretch
index 70a063e..b6566cd 100644
--- a/templates/rpi3stretch
+++ b/templates/rpi3stretch
@@ -2,3 +2,5 @@
 RPI_MODEL=3
 RELEASE=stretch
 BUILD_KERNEL=true
+# ENABLE_WIRELESS=false
+# ENABLE_BLUETOOTH=false