#469 New color scheme, better contrast