Mixture Templates - bugfix in tokenizer + var modifiers