Better command highlighting