Updated to add bookmarks to bookmark-categories.