Revise window-status settings
Merge branch 'master' into mac