Ensure all templates can be resolved, add solver script, fix templates