Replace match with syntax match - less bugs