Flatten if/else block to reduce code duplication. Use tertiary for colour setting.
Merge pull request #34 from mkernahan/colours

Flatten if/else block to reduce code duplication. Use tertiary for colou...