X11: Updated standalone stuff, cleanups