Add xscrnsaver to USE_XORG. Clean up some leftover.
Fix plist after 1.6.1 update.