improved highlight syntax