Refactor .xsession
Merge branch 'master' into zion