Updated/New Composer support for Text_Highlighter

See diff for full changes