[2.1.1] More non-visible style changes
Start work on a general template

The template should use the styles from 2.1.1 and some of the code from
3.1.1