Merge upstream changes from skwp/dotfiles