Merge 'bright' into 'highlight' and 'neutral' into 'lowlight'.