Merge in xdefaults