Add <span>s to displayed token