Fix zshrc loading scripts to use new setup