Apply surface::Class to content of templates, rather than wrapping template