Additional color-identifiers tweaking.