Minor fixes for custom theme: better contrast