Allow more than 5 categories - Closes: #93