Refactor .xsession