Updated several files, and added Xdefaults