switching to programmer dvorak
Merge branch 'master' into desktop