merge with upstream, changed genre backgrounds and page counts