Better distinction between OS and window system