FIXING: gulp injections
FIXING: still some gulp stuff