Added more tokens. Also removed whitespace from a select few tokens because it might mess with styling, and the admin system doesn't output spaces for some tokens