Clean up zsh prompt
Clean up script
Upgrade submodules to latest versions