Refactor grunt and rebuild theme