color tweaks, cleaned up