Add support for home template
Cleanup
Merge branch 'master' of https://github.com/hofmannsven/hofmannsven