Merged some templates for board...