fixed bug in admin panel, and combined 'theme' and 'template'