More finest controls & gulp integration