Update based on latest dot.mkshrc