Revert "Use xklavier instead."

This reverts commit 1f67ed20d093b91d81a115e15793058571933aee.
4 files changed