Move theme application to template tag