addressed PR review comments
Updated highlighting color scheme as per EB's specs