merge office programs, graphical web browsers and other x-based programs into x programs
misc merging fixes