new search template. theme clean up