Change when statement
Fixed typo
Moved color names to a constant
Merge pull request #1 from gmjorge/master

ColorScheme logic code refactor