added cinder and more template options