Gulp changes, deleted mixins, small improvements