Improved screensaver (issue #37)