Some more style tweaks

Remove use of hardcoded colors.
Fix color change updating (regression)