Attempt to fix highlight colours