Updated template parser

Adds all needed terms
Loses formatting