moved stuff to (when window-system