reorder commands
color abbreviations
move git scripts to separate dir