Category template working, except tags
Cleaned up templating system