Rename target xkb to keyboard.
Cleanup keyboard target.