Implementing some changes based on Mathias’s world-famous dotfiles