some color fixes, general consistency

:dog2: :dash: