cleanups to theme