ALL THEM STYLES
Merge branch 'template'