improving import template_theme