modified configuration files and templating unification