Fix xmobar positions
Merge branch 'zion'