.Xdefaults clean-up plus additional overrides