Shortcut, command and fix some highlight bug.