Update highlighting to be crisper