Merged with ZasoGD's beta bookmarks plugin