Improve colors for theme with light background