Change color scheme
Merge branch 'styling'