Remove reference to template target
Remove all style properties, template improvements