change theme functions

manual merge conflicts - added callbacks to theme functions, changed
delete theme via id to delete theme via name