diff --git a/.gitignore b/.gitignore
index 3c5325c..f73efb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *.pdf
 *.html
 *.xml
+
+livecd/out
+livecd/work
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..eb8eda3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "livecd/airootfs/etc/skel"]
+	path = livecd/airootfs/etc/skel
+	url = git@git.dustvoice.de:DustVoice/dotfiles.git
diff --git a/Documentation.adoc b/Documentation.adoc
index 502b973..9bdc2b7 100644
--- a/Documentation.adoc
+++ b/Documentation.adoc
@@ -22,7 +22,7 @@ Even when you do use a standard keyboard layout, there could still be some custo
 
 In my case, I'll want the `Caps_Lock` key mapped to `Escape` for the american keyboard layouts (both the standard and the international version) as well as for the german layout with no dead keys (` won't require two keypresses).
 
-All keymaps are stored under `/usr/shar/kbd/keymaps` and in my case the default keyboard map used for the german language with no dead keys resides under `/usr/share/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz` and the US layouts are to be found under `/usr/share/kbd/keymaps/i386/qwerty/us.map.gz` _(normal US version)_ and `/usr/share/kbd/keymaps/i386/qwerty/us-acentos.map.gz` _(US international layout)_ respectively.
+All keymaps are stored under `/usr/share/kbd/keymaps` and in my case the default keyboard map used for the german language with no dead keys resides under `/usr/share/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz` and the US layouts are to be found under `/usr/share/kbd/keymaps/i386/qwerty/us.map.gz` _(normal US version)_ and `/usr/share/kbd/keymaps/i386/qwerty/us-acentos.map.gz` _(US international layout)_ respectively.
 
 Now we switch to the `/tmp` directory and create our new keymap(s).
 
@@ -128,7 +128,7 @@ Now you are able to load the keymap and set it as the default one to use
 [source, console]
 ----
 root@archiso ~ # loadkeys custom-us
-root@archiso ~ # locatectl set-keymap --noconvert custom-us
+root@archiso ~ # localectl set-keymap --no-convert custom-us
 ----
 
 === Updating the system
@@ -1035,9 +1035,7 @@ I'm using `pass` as my password manager. To use it I have to do
 dustvoice@DustArch ~
 $ sudo pacman -S pass
 dustvoice@DustArch ~
-$ git clone git@git.dustvoice.de:DustVoice/pass.git
-dustvoice@DustArch ~
-$ mv pass .password-store
+$ git clone git@git.dustvoice.de:DustVoice/pass.git .password-store
 ----
 
 ==== Web browser
@@ -1166,6 +1164,7 @@ pass
 pcsclite
 ppp
 pptpclient
+python-pip
 python3
 refind-efi
 reiserfsprogs
diff --git a/livecd/airootfs/etc/hostname b/livecd/airootfs/etc/hostname
index 2dbe21e..f113f36 100644
--- a/livecd/airootfs/etc/hostname
+++ b/livecd/airootfs/etc/hostname
@@ -1 +1 @@
-archiso
+DustArch
diff --git a/livecd/airootfs/etc/hosts b/livecd/airootfs/etc/hosts
new file mode 100644
index 0000000..1cff437
--- /dev/null
+++ b/livecd/airootfs/etc/hosts
@@ -0,0 +1,6 @@
+# Static table lookup for hostnames.
+# See hosts(5) for details.
+
+127.0.0.1	localhost		.
+::1		localhost		.
+127.0.1.1	DustArch.localhost	DustArch
diff --git a/livecd/airootfs/etc/skel b/livecd/airootfs/etc/skel
new file mode 160000
index 0000000..a24f17c
--- /dev/null
+++ b/livecd/airootfs/etc/skel
@@ -0,0 +1 @@
+Subproject commit a24f17c88a1ac9ea043d724a13c1e6a1c7851251
diff --git a/livecd/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/livecd/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf.disabled
similarity index 100%
rename from livecd/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
rename to livecd/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf.disabled
diff --git a/livecd/airootfs/root/.automated_script.sh b/livecd/airootfs/root/.automated_script.sh
deleted file mode 100755
index 81a98a1..0000000
--- a/livecd/airootfs/root/.automated_script.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-script_cmdline ()
-{
-    local param
-    for param in $(< /proc/cmdline); do
-        case "${param}" in
-            script=*) echo "${param#*=}" ; return 0 ;;
-        esac
-    done
-}
-
-automated_script ()
-{
-    local script rt
-    script="$(script_cmdline)"
-    if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
-        if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
-            wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
-            rt=$?
-        else
-            cp "${script}" /tmp/startup_script
-            rt=$?
-        fi
-        if [[ ${rt} -eq 0 ]]; then
-            chmod +x /tmp/startup_script
-            /tmp/startup_script
-        fi
-    fi
-}
-
-if [[ $(tty) == "/dev/tty1" ]]; then
-    automated_script
-fi
diff --git a/livecd/airootfs/root/.zlogin b/livecd/airootfs/root/.zlogin
deleted file mode 100644
index f598e43..0000000
--- a/livecd/airootfs/root/.zlogin
+++ /dev/null
@@ -1 +0,0 @@
-~/.automated_script.sh
diff --git a/livecd/airootfs/root/customize_airootfs.sh b/livecd/airootfs/root/customize_airootfs.sh
index bf5210c..f830260 100755
--- a/livecd/airootfs/root/customize_airootfs.sh
+++ b/livecd/airootfs/root/customize_airootfs.sh
@@ -3,11 +3,19 @@
 set -e -u
 
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
+sed -i 's/#\(de_DE\.UTF-8\)/\1/' /etc/locale.gen
 locale-gen
+localectl set-locale LANG="en_US.UTF-8"
 
-ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+hwclock --systohc --utc
+timedatectl set-timezone Europe/Berlin
+timedatectl set-ntp true
 
-usermod -s /usr/bin/zsh root
+loadkeys custom-us
+localectl set-keymap --no-convert custom-us
+
+usermod -s /usr/bin/fish root
 cp -aT /etc/skel/ /root/
 chmod 700 /root
 
@@ -19,5 +27,21 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
 
+pip3 install pygments
+gem install asciidoctor --pre
+gem install asciidoctor-pdf --pre
+gem install asciidoctor-epub3 --pre
+gem install pygments.rb --pre
+
+python3 ~/.config/nvim/plugged/YouCompleteMe/install.py --clang-completer
+
 systemctl enable pacman-init.service choose-mirror.service
 systemctl set-default multi-user.target
+
+systemctl enable dhcpcd.service
+systemctl start dhcpcd.service
+
+systemctl enable pcscd
+systemctl start pcscd
+
+gpg-connect-agent updatestartuptty /bye
diff --git a/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us-acentos.map.gz b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us-acentos.map.gz
new file mode 100644
index 0000000..0dcb65c
Binary files /dev/null and b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us-acentos.map.gz differ
diff --git a/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us.map.gz b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us.map.gz
new file mode 100644
index 0000000..ad4a6f1
Binary files /dev/null and b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwerty/custom-us.map.gz differ
diff --git a/livecd/airootfs/usr/share/kbd/keymaps/i386/qwertz/custom-de.map.gz b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwertz/custom-de.map.gz
new file mode 100644
index 0000000..dfcf997
Binary files /dev/null and b/livecd/airootfs/usr/share/kbd/keymaps/i386/qwertz/custom-de.map.gz differ
diff --git a/livecd/packages.x86_64 b/livecd/packages.x86_64
index ed6ec14..72652dc 100644
--- a/livecd/packages.x86_64
+++ b/livecd/packages.x86_64
@@ -1,8 +1,15 @@
+alsa-utils
 arch-install-scripts
 b43-fwcutter
 broadcom-wl
+browserpass
+browserpass-chromium
 btrfs-progs
+ccid
+chromium
+clang
 clonezilla
+cmake
 crda
 darkhttpd
 ddrescue
@@ -13,35 +20,52 @@ diffutils
 dmraid
 dnsmasq
 dnsutils
+dolphin
 dosfstools
 elinks
 ethtool
 exfat-utils
 f2fs-tools
+fbida
+fish
 fsarchiver
+ghostscript
+git
+gnome-terminal
 gnu-netcat
+gnupg
+gparted
 gpm
 gptfdisk
 grml-zsh-config
 grub
+grub
 hdparm
+i3
+i3status
+iputils
 ipw2100-fw
 ipw2200-fw
 irssi
 iwd
 jfsutils
 lftp
+libusb-compat
 linux-atm
 linux-firmware
 lsscsi
 lvm2
+make
 man-db
 man-pages
 mc
 mdadm
 mtools
+mtools
+mupdf
 nano
 ndisc6
+neovim
 netctl
 nfs-utils
 nilfs-utils
@@ -49,34 +73,46 @@ nmap
 ntfs-3g
 ntp
 openconnect
+opensc
 openssh
 openvpn
+os-prober
 partclone
 parted
 partimage
+pass
+pcsclite
 ppp
 pptpclient
+python-pip
+python3
 refind-efi
 reiserfsprogs
+rofi
 rp-pppoe
 rsync
+ruby
+rubygems
 sdparm
 sg3_utils
 smartmontools
 sudo
 tcpdump
 testdisk
+ttf-hack
 usb_modeswitch
 usbutils
 vi
 vim-minimal
 vpnc
 wget
+wicd
 wireless-regdb
 wireless_tools
 wpa_supplicant
 wvdial
 xfsprogs
 xl2tpd
-
-
+xorg
+xorg-drivers
+xorg-xinit