diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index dcaf7dd..49ab0a0 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,4 +1,6 @@
 UNRELEASED:
+  * Add all extra packages back - Mathematica, BlueJ, Greenfoot, NodeRED, Claws Mail and VNC Viewer
+2018-10-09:
   * In startup wizard, assign keyboard to country as per Debian installer recommendations
   * In startup wizard, add option to use US keyboard in preference to country-specific option
   * In startup wizard, show IP address on first page
@@ -19,7 +21,6 @@ UNRELEASED:
   * Add ability to prevent software update changing configuration files, by creating ~/.config/.lock file
   * Various other small bug fixes, tweaks and changes to text
   * Make dhcpcd work with 3G devices
-  * Set default timezone to 'Europe/London'
   * Add hw acceleration to ffmpeg
   * Improved WiFi-BT coexistence parameters
   * Run fake-hwclock before systemd-fsck-root
diff --git a/stage2/03-accept-mathematica-eula/00-debconf b/stage2/03-accept-mathematica-eula/00-debconf
new file mode 100644
index 0000000..d9743fe
--- /dev/null
+++ b/stage2/03-accept-mathematica-eula/00-debconf
@@ -0,0 +1,2 @@
+# Do you accept the Wolfram - Raspberry Pi® Bundle License Agreement?
+wolfram-engine  shared/accepted-wolfram-eula    boolean true
diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS
index b741334..136cc77 100644
--- a/stage2/EXPORT_NOOBS
+++ b/stage2/EXPORT_NOOBS
@@ -1,2 +1,2 @@
 NOOBS_NAME="Raspbian Lite"
-NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (minimal version)"
+NOOBS_DESCRIPTION="A port of Debian with no desktop environment"
diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages
index 5e18228..898dff8 100644
--- a/stage4/00-install-packages/00-packages
+++ b/stage4/00-install-packages/00-packages
@@ -1,21 +1,16 @@
 java-common oracle-java8-jdk
-libreoffice-sdbc-hsqldb
-sonic-pi
 python idle python3-pygame python-pygame python-tk
 python3 idle3 python3-tk
 python3-pgzero
 python-serial python3-serial
 python-picamera python3-picamera
-debian-reference-en dillo x2x
+debian-reference-en dillo
 raspberrypi-net-mods raspberrypi-ui-mods
-smartsim
 python-pip python3-pip
 python3-numpy
 pypy
-minecraft-pi python-minecraftpi
 alacarte rc-gui sense-hat
 tree
-scratch nuscratch
 libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr
 geany
 piclone
@@ -25,10 +20,7 @@ python-twython python3-twython
 python-smbus python3-smbus
 python-flask python3-flask
 python-picraft python3-picraft
-python-sense-emu python3-sense-emu sense-emu-tools python-sense-emu-doc
 pprompt
-scratch2
-python3-thonny
 piwiz
 rp-prefapps
 libav-tools
diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr
index 32472bb..9e19f6c 100644
--- a/stage4/00-install-packages/00-packages-nr
+++ b/stage4/00-install-packages/00-packages-nr
@@ -1,4 +1,3 @@
-libreoffice-pi
 timidity
 pi-package
 realvnc-vnc-server
diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages
index 6b03f87..fc43d17 100644
--- a/stage4/00-install-packages/02-packages
+++ b/stage4/00-install-packages/02-packages
@@ -1,6 +1,4 @@
 hunspell-en-gb
 hyphen-en-gb
-libreoffice-help-en-gb
-libreoffice-l10n-en-gb
 wamerican
 wbritish
diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS
index 4823501..2ef6d7b 100644
--- a/stage4/EXPORT_NOOBS
+++ b/stage4/EXPORT_NOOBS
@@ -1,2 +1,2 @@
 NOOBS_NAME="Raspbian"
-NOOBS_DESCRIPTION="A port of Debian Stretch for the Raspberry Pi (full desktop version)"
+NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"
diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages
new file mode 100644
index 0000000..a79d71e
--- /dev/null
+++ b/stage5/00-install-extras/00-packages
@@ -0,0 +1,13 @@
+python3-thonny
+sonic-pi
+scratch nuscratch scratch2
+smartsim
+
+minecraft-pi python-minecraftpi
+python-sense-emu sense-emu-tools python-sense-emu-doc
+
+wolfram-engine
+claws-mail
+greenfoot bluej
+nodered
+realvnc-vnc-viewer
diff --git a/stage5/00-install-libreoffice/00-packages-nr b/stage5/00-install-libreoffice/00-packages-nr
new file mode 100644
index 0000000..0249e8e
--- /dev/null
+++ b/stage5/00-install-libreoffice/00-packages-nr
@@ -0,0 +1 @@
+libreoffice-pi
diff --git a/stage5/00-install-libreoffice/01-packages b/stage5/00-install-libreoffice/01-packages
new file mode 100644
index 0000000..5d1e076
--- /dev/null
+++ b/stage5/00-install-libreoffice/01-packages
@@ -0,0 +1,3 @@
+libreoffice-sdbc-hsqldb
+libreoffice-help-en-gb
+libreoffice-l10n-en-gb
diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE
new file mode 100644
index 0000000..a81a844
--- /dev/null
+++ b/stage5/EXPORT_IMAGE
@@ -0,0 +1,4 @@
+IMG_SUFFIX="-full"
+if [ "${USE_QEMU}" = "1" ]; then
+	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
+fi
diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS
new file mode 100644
index 0000000..cb10203
--- /dev/null
+++ b/stage5/EXPORT_NOOBS
@@ -0,0 +1,2 @@
+NOOBS_NAME="Raspbian Full"
+NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"
diff --git a/stage5/prerun.sh b/stage5/prerun.sh
new file mode 100755
index 0000000..9acd13c
--- /dev/null
+++ b/stage5/prerun.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+if [ ! -d "${ROOTFS_DIR}" ]; then
+	copy_previous
+fi