Support layer options override. Fix gutter.

maybe use || (logical or)