improved dark template; added light template