Improved zsh config
Also improved bash config