Add window-number mode