[WIP] New pattern config

- still broken
Fixed regressions