Re-order PS1 variables