Clean up yaml and add variables.less to non-default collections