Improved highlight module.