Improve some color to be more semantic