Incorporate Zsh, extract common rc-components and clean-up