Refactor Grunt task
Rebuild theme