#105 Refactor the WYSIWYG

Eventually a possibility, but not for this merge. I'd rather get a working new WYSIWYG in than take the chance of breaking multiple things.