Refactored all template replacements strings to templates
1.1.0 Release