diff --git a/calamares/branding/vesperos/branding.desc b/calamares/branding/vesperos/branding.desc
index 2da3e48..213dc36 100644
--- a/calamares/branding/vesperos/branding.desc
+++ b/calamares/branding/vesperos/branding.desc
@@ -9,10 +9,10 @@ windowPlacement: center
 strings:
     productName:         VesperOS
     shortProductName:    VesperOS
-    version:             14
-    shortVersion:        14
-    versionedName:       VesperOS 14
-    shortVersionedName:  VesperOS 14
+    version:             Rainier
+    shortVersion:        Rainier
+    versionedName:       VesperOS Rainier
+    shortVersionedName:  VesperOS Rainier
     bootloaderEntryName: VesperOS
     productUrl:          https://vesperos.oxmc.me
     supportUrl:          https://vesperos.oxmc.me/support
diff --git a/calamares/modules/users.conf b/calamares/modules/users.conf
index 41a05e8..103692a 100644
--- a/calamares/modules/users.conf
+++ b/calamares/modules/users.conf
@@ -1,4 +1,5 @@
 ---
+userShell:       /bin/zsh
 userGroup:       users
 defaultGroups:
     - cdrom
diff --git a/helpers/calamares-postinstall b/helpers/calamares-postinstall
index 2cdba1c..2ff95f8 100755
--- a/helpers/calamares-postinstall
+++ b/helpers/calamares-postinstall
@@ -5,7 +5,8 @@
 
 TARGET="${CALAMARES_CHROOT:-/tmp/calamares-root}"
 ISO_MOUNT="/run/live/medium"
-RECOVERY_KERNEL_SRC="${ISO_MOUNT}/boot/recovery.bzImage"
+RECOVERY_KERNEL_SRC="${ISO_MOUNT}/boot/recovery.vmlinuz"
+RECOVERY_INITRD_SRC="${ISO_MOUNT}/boot/recovery.initrd"
 
 # Find the recovery partition (labelled "recovery" by the partition module)
 RECOVERY_DEV="$(blkid -L recovery 2>/dev/null || true)"
@@ -19,18 +20,25 @@ RECOVERY_MNT="$(mktemp -d /tmp/recovery-mount.XXXXXX)"
 mount "${RECOVERY_DEV}" "${RECOVERY_MNT}"
 
 echo "Copying RecoveryOS to ${RECOVERY_DEV}..."
-cp "${RECOVERY_KERNEL_SRC}" "${RECOVERY_MNT}/recovery.bzImage"
+cp "${RECOVERY_KERNEL_SRC}"  "${RECOVERY_MNT}/recovery.vmlinuz"
+cp "${RECOVERY_INITRD_SRC}"  "${RECOVERY_MNT}/recovery.initrd"
 
 umount "${RECOVERY_MNT}"
 rmdir  "${RECOVERY_MNT}"
 
 # Add recovery GRUB entry to installed system
 GRUB_CUSTOM="${TARGET}/etc/grub.d/40_custom"
+if [ ! -f "${GRUB_CUSTOM}" ]; then
+    install -m 755 /dev/null "${GRUB_CUSTOM}"
+    echo '#!/bin/sh' > "${GRUB_CUSTOM}"
+    echo 'exec tail -n +3 $0' >> "${GRUB_CUSTOM}"
+fi
 cat >> "${GRUB_CUSTOM}" << 'GRUBEOF'
 
 menuentry "Recovery OS" {
     search --set=root --label recovery
-    linux  /recovery.bzImage
+    linux  /recovery.vmlinuz console=tty1 splash
+    initrd /recovery.initrd
 }
 GRUBEOF