Template fix and import of base config files