I know this isn't part of this pull request but I noticed it. I was wondering why we are referencing templates in the __islandora_image_annotation__ module? Could we not just call the theme functions it provides directly?