Improve some colors to be more semantic