fixed theme and added minified watchers