Refactor to use Plugin syntax. Added plugin for marking current words