Rebuild including default templates