Fix styles one more time and better gulp file