Fixed breaking of x problems
Merge branch 'master' of https://github.com/himmelwr/dotfiles