Switched to new layout & zsh