update keymap
some change in sw manager
Merge