More changes

Just a few more changes, like changing category-<slug> to
category-{slug}