clipfish: genre updates
Merge remote-tracking branch 'origin/billy'