/etc/crypttab

/dev/sda5 umbrella none hash=sha1

cryptswap1 UUID=fe31da3d-c489-47bb-8306-d66003965873 /dev/urandom swap,cipher=aes-cbc-essiv:sha256
#^ not sure if this line is needed, I have swap under umbrella also

###################################################################################################

/etc/fstab

# <file system> <mount point>   <type>  <options>       <dump>  <pass>
/dev/mapper/umbrella-root /               ext4    errors=remount-ro 0       1
# /boot was on /dev/sda1 during installation
UUID=7a0bf546-525a-4038-8ed5-7b8073237d00 /boot           ext2    defaults        0       2
/dev/mapper/umbrella-home /home           ext4    defaults        0       2
/dev/mapper/umbrella-swap_1 none            swap    sw              0       0
/dev/mapper/cryptswap1 none swap sw 0 0