add .Xdefaults and change Makefile