Commit

Isolate smarty integration