Refactor templates
Config