Reworked gulp tasks