A better highlighting solution