Moved highlight style to common