Added option to make window mode the default