Merge pull request #1385 from drainx/master

Fix token error on Status menu items
Fix Status->All status variables to display correct suffix and formatting.

Broken by f9cd1a1a227d193dc8a70decb8e59607deb3e165

Signed-off-by: Daniel Rix <drainx1@live.com>