Moved the X11 replacement to the proper place