Cleanup doctype handling
Merge branch 'master' of https://github.com/Wolframe/Wolframe