Updated XMLTool and Pixmap in src/util.