diff --git a/README.md b/README.md
index f8acd78..1a6155d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Focus v2.4
+# Focus v2.5
 A presentation theme for LaTeX Beamer that aims at a clean and minimalist design,
 so to minimize distractions and put the focus directly on the content.
 
diff --git a/beamerouterthemefocus.sty b/beamerouterthemefocus.sty
index 7dc775a..386815d 100644
--- a/beamerouterthemefocus.sty
+++ b/beamerouterthemefocus.sty
@@ -51,7 +51,7 @@
 }
 
 % Plain header.
-\defbeamertemplate{frametitle}{plain}{%
+\defbeamertemplate*{frametitle}{plain}{%
     % If not title page.
     \ifnum\value{realframenumber}>0%
         \vspace{-1pt}%
@@ -109,7 +109,7 @@
 }
 
 % Full bar footline.
-\defbeamertemplate{footline}{fullbar}{%
+\defbeamertemplate*{footline}{fullbar}{%
     % If not appendix.
     \ifnum\mainend<0% From package appendixnumberbeamer.
         %
@@ -134,7 +134,7 @@
 }
 
 % Empty footline.
-\defbeamertemplate{footline}{none}{}
+\defbeamertemplate*{footline}{none}{}
 
 \DeclareOptionBeamer{numbering}{\def\beamer@focus@numbering{#1}}
 \ExecuteOptionsBeamer{numbering=progressbar}
@@ -153,14 +153,14 @@
     \end{tikzpicture}%
 }
 
-\defbeamertemplate{background canvas}{focusplain}{%
+\defbeamertemplate*{background canvas}{focusplain}{%
     \begin{tikzpicture}
         \clip (0,0) rectangle ++(\paperwidth,\paperheight);
         \fill[normal text.bg] (0,0) rectangle ++(\paperwidth,\paperheight);
     \end{tikzpicture}%
 }
 
-\defbeamertemplate{background canvas}{focusframe}{%
+\defbeamertemplate*{background canvas}{focusframe}{%
     \begin{tikzpicture}
         \clip (0,0) rectangle ++(\paperwidth,\paperheight);
         \fill[frametitle.bg] (0,0) rectangle ++(\paperwidth,\paperheight);        
diff --git a/beamerthemefocus.sty b/beamerthemefocus.sty
index 550e120..134cd05 100644
--- a/beamerthemefocus.sty
+++ b/beamerthemefocus.sty
@@ -19,7 +19,7 @@
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2019/06/26 v2.4 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2019/11/20 v2.5 Focus Beamer theme]
 
 \mode<presentation>