Go back to xscreensaver. Mostly.