Unify scripts and add prezto fixes