FWIW, to get it to divert all new windows to tabs, I think you do need TabMixPlus or the like. There are settings in it to disable things like the color-coded tabs. Otherwise at least some pop-ups (e.g. the ones triggered by Javascript) will still be pop-ups.