Updated the new wysiwyg stuff.

Should be fully functional.