updated gulpfile and added mixins to main layout