diff --git a/build.sh b/build.sh
index a8247ab..e9f887a 100755
--- a/build.sh
+++ b/build.sh
@@ -172,12 +172,12 @@ export WPA_PASSWORD
 export WPA_COUNTRY
 export ENABLE_SSH="${ENABLE_SSH:-0}"
 
-export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_GB.UTF-8}"
+export LOCALE_DEFAULT="${LOCALE_DEFAULT:-en_US.UTF-8}"
 
-export KEYBOARD_KEYMAP="${KEYBOARD_KEYMAP:-gb}"
-export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (UK)}"
+export KEYBOARD_KEYMAP="${KEYBOARD_KEYMAP:-us}"
+export KEYBOARD_LAYOUT="${KEYBOARD_LAYOUT:-English (QUILT_NO_DIFF_TIMESTAMPS)}"
 
-export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-Europe/London}"
+export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-America/New_York}"
 
 export GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
 
diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages
index 83ec74c..06ff829 100644
--- a/stage2/01-sys-tweaks/00-packages
+++ b/stage2/01-sys-tweaks/00-packages
@@ -1,13 +1,40 @@
-ssh less fbset sudo psmisc strace ed ncdu crda
-console-setup keyboard-configuration debconf-utils parted unzip
-build-essential manpages-dev python bash-completion gdb pkg-config
-python-rpi.gpio v4l-utils
+ssh
+less
+fbset
+sudo
+psmisc
+strace
+ed
+ncdu
+crda
+console-setup
+keyboard-configuration
+debconf-utils
+parted
+unzip
+build-essential
+manpages-dev
+python
+python-pip
+python-dev
+python-setuptools
+python-virtualenv
+git
+libyaml-dev
+bash-completion
+gdb
+pkg-config
+python-rpi.gpio
+v4l-utils
 avahi-daemon
-lua5.1
-luajit
-hardlink ca-certificates curl
-fake-hwclock nfs-common usbutils
-libraspberrypi-dev libraspberrypi-doc libfreetype6-dev
+hardlink
+ca-certificates
+curl
+fake-hwclock
+nfs-common
+usbutils
+libraspberrypi-dev
+libfreetype6-dev
 dosfstools
 dphys-swapfile
 raspberrypi-sys-mods
diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages
index eac74ea..a3a7de4 100644
--- a/stage3/00-install-packages/00-packages
+++ b/stage3/00-install-packages/00-packages
@@ -1,15 +1,20 @@
-gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav
-qpdfview gtk2-engines alsa-utils
-desktop-base
-git
-omxplayer
+gstreamer1.0-x
+gstreamer1.0-omx
+gstreamer1.0-plugins-base
+gstreamer1.0-plugins-good
+gstreamer1.0-plugins-bad
+gstreamer1.0-alsa
+gstreamer1.0-libav
+gtk2-engines
+alsa-utils
 raspberrypi-artwork
 policykit-1
 gvfs
 rfkill
-chromium-browser rpi-chromium-mods
+firefox-esr
 gldriver-test
 fonts-droid-fallback
 fonts-liberation2
 obconf
 arandr
+openbox
diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh
index d768747..a98a1db 100755
--- a/stage3/00-install-packages/01-run.sh
+++ b/stage3/00-install-packages/01-run.sh
@@ -2,7 +2,7 @@
 
 on_chroot << EOF
 update-alternatives --install /usr/bin/x-www-browser \
-  x-www-browser /usr/bin/chromium-browser 86
+  x-www-browser /usr/bin/firefox-esr 86
 update-alternatives --install /usr/bin/gnome-www-browser \
-  gnome-www-browser /usr/bin/chromium-browser 86
+  gnome-www-browser /usr/bin/firefox-esr 86
 EOF