sakura.conf: add
20-keyboard.conf: remove: keyboard is configured by xinitrc
conf/updatefiles.sh: remove