Change colour options
Fix display logic
Merge pull request #288 from theodi/feature-change-colour-options

Change colour options