Smart v2

Update to version 2.0 of the template!