Make new Bricks-only options work with OxygenBuilder#147

There are some recent updates or new features available that only work with Bricks. OxygenBuilder should have those features also please.