Fixed new solar templates