Update window-mode with master