Why don't we consider switching to X11?  Be one of the first two do it.  EMC2 is working on it now.