Merge pull request #68 from aks/master

Refactored out color defs & assignments; other optimizations.