Use bookmark package. Modified diagrams to work with dvipdfmx.  Now PDF bookmarks work again.