Changes:

Easier to configure, moved variables.
Fixed bug exposed by adding categories.