Applied new parser to most template modes, deprecated old structures.