Updated dependencies
Moved templates into their own definition, form theme is optional
Updated templates