JAL-629 Change colour scheme shortnames to something consistent and command-line...