Changed a few more keybindings to use keys specified with the kbd function.