Use graphicx defaults

Instead of redefining \includegraphics in LateX and beamer templates, the
preambles now use the graphicx \setkey system.