Added Markdown links and some new sources. Refactored templating use