Xdefaults
Merge branch 'xdef'