I think NG / NG+ should be separate categories rather than sub-categories

All ILs I'm submitting after this are from this run to fill the boards