fix emacs mode to match new surfact syntax
fix vim mode to match new surfact syntax