adding autotag
correctly moving the theme to the right place