Fix templates to conform with templar's new block syntax