Fixed gulp compile & Theme color changed