Update color scheme
Merge branch 'heroku'