Consolidated some templates.
Add Genre