The borderless tables is also not necessary and IMO doesn't add value unless either:
The graphics have to flow text to the left or right of the graphic.
You put your captions above a multi-page graphic and want to repeat the same caption on each of the pages.

If neither of these apply to your graphics then the tables are an extra level of complexity for no discernable value.

I see you've solved the issue now but don't put the macro in the same template as your bibliography tools. You should have a project explorer on the left of the VBA editor GUI. From there you can choose a template and module in which to place your macro. You will be able to add modules to the Normal template and can put the macro in there.

__________________
Andrew Lockton
Chrysalis Design, Melbourne Australia