change grid var name grid-margin to grid-gutter