Update templates to use field macro options.