Tidy up config files and add functionality from old zsh configs