Keymap updates and syntax changes for SK