Tweaking colors to ensure proper values are used and listed