- support X11 tile files (with or without XPM) that are 40 tiles wide - rearrange some X11 code to share more code between XPM & non-XPM options - clean out some deprecated X11/winmap.c #ifdefs - update Qt code minimally to handle such an XPM file