WIP: Temporary hack for different highlights