removed terms, renamed some funs, added themes