Changed editing shorthand from .markdown to .html, and added some more definitions