Moving to a more general template

Hey there,

as written on twitter, I really like your approach for this, I would like to contribute to getting this out as a template. Here are my first small improvements. I like to get any feedback you have :)