Added support for admin theme/no theme setting, moved templates to appropriate files