Move token type to the advanced options section
Merge branch 'token-type'