Color tweaks
Various cleanup