[TASK] Rework Render
Merge pull request #39 from randomresult/Render

[TASK] Rework TemplateFiles