Improve sass watch and generation