Categories

This branch uses categories from a configuration file, rather than hard-coded ones, in two places.