Moved highlighting groups to after/