Update gulpfile, composer, layout