Added term_themes
Cleaning things up