Fix missing style argument on a few templates
Start making things more dynamic and modular