revert + Add new config to use multiple windows