Fixed up separate extraction of category.
added category icons.
Added _image hook.
Fixed image inclusion.