Revise Gulpfile and fix scripts