Color changes

Signed-off-by: Nils Torbjörn Petersen <kontakt@entepe.de>
Merge branch 'develop' into gh-pages