xinitrc/xsession merged and tweaked