Hi, I found 2 differents bugs on WYSIWYG Editor Module. I copy/paste "Load on demand using velocity macros" example: http://extensions.xwiki.org/xwiki/bin/view/Extension/WYSIWYG+Editor+Module#H... On Xwiki 7.0.1, I load the WYSIWYG Editor, I type some words in WYSIWYG tab, I underline a word and select source tab  => a end of line is inserted before __ characters. It is the same behavior with strikethrough word. Any ideas how to fix it? With Xwiki 8.1, WYSIWYG Editor is loading anymore. Thxs. Pascal B