Clean up
Merge pull request #4 from StarClutch/master

Fix setting color issues