modified Xmodmap
Merge branch 'testing'