[keymap] keymap changes and charset partial changes for 3-25