Additional keybindings, and slight coloring change