Refactor colors. Fixes #318
Merge branch 'color-refactor'