Improve newly installed highlight hack