token style fixes