Return previous color scheme.
Merge branch 'feature/design_fix_40' into staging