Handle template substitutions

#153
No need to explicitly apply face to string nodes
Comment the new token types