edited ThemeTools