refactored default templates, improved bundle inclusion