Add `window-number-switch' and binding it with 'C-x o' default.