X stays on top
Merge branch 'master' of https://github.com/loopyz/spontaneity