More then 2 favorite categories?

I just upgraded to Quantum, is there a way to create more favorite categories then 2?  I like to create one for my movie channels, one for news, one for History type channels and another for local channels. Can the favorites be renamed also?

Thanks