diff --git a/beamerthemelines.sty b/beamerthemelines.sty
index 71445e4..84df765 100644
--- a/beamerthemelines.sty
+++ b/beamerthemelines.sty
@@ -71,7 +71,7 @@
 % arguments: name of color theme, width of line
 \newcommand{\beamer@horizontal@line@top}[2]{%
   \ifbeamercolorempty[fg]{#1}{}{%
-    \begin{beamercolorbox}[vmode]{#1}
+    \begin{beamercolorbox}[vmode,wd=\linewidth]{#1}
       \rule{\linewidth}{#2}
     \end{beamercolorbox}%
     \par\nointerlineskip}%
@@ -82,7 +82,7 @@
 \newcommand{\beamer@horizontal@line@bottom}[2]{%
   \ifbeamercolorempty[fg]{#1}{}{%
     \par\nointerlineskip%
-    \begin{beamercolorbox}[vmode]{#1}
+    \begin{beamercolorbox}[vmode,wd=\linewidth]{#1}
       \rule{\linewidth}{#2}
     \end{beamercolorbox}}%
 }
@@ -478,7 +478,7 @@
 \setbeamertemplate{message symbol}[circle]
 
 \newcommand{\message@box@body}{
-  \begin{beamercolorbox}[vmode,colsep=1mm,leftskip=1mm,rightskip=1mm]{message}
+  \begin{beamercolorbox}[vmode,wd=\linewidth,colsep=1mm,leftskip=1mm,rightskip=1mm]{message}
     \setbox0=\hbox{\usebeamertemplate{message symbol}\unskip}%
     \ifdim\wd0=0pt%
       \strut\insertmessage
@@ -584,11 +584,14 @@
 \defbeamertemplate{quotation end}{lines}[1][1pt]{\beamer@horizontal@line@bottom{quotation line bottom}{#1}}
 \setbeamertemplate{quotation end}[lines][0.5pt]
 
+\newlength{\beamer@quotation@tmp}
+
 % see definition in /usr/share/texmf/tex/latex/beamer/base/beamerbaselocalstructure.sty 
 \renewenvironment<>{quotation}[1][]
 { \def\insertquoteauthor{#1}
   \actionenv#2%
-  \beamercolorbox[vmode]{quotation}
+  \setlength{\beamer@quotation@tmp}{\linewidth}
+  \beamercolorbox[vmode,wd=\linewidth]{quotation}
   \usebeamertemplate{quotation begin}
   \usebeamerfont*{quotation}%
   \usebeamercolor{quotation}%
@@ -618,6 +621,7 @@
 {%
   \usebeamertemplate{quotation author}
   \endlist
+  \setlength{\linewidth}{\beamer@quotation@tmp}
   \usebeamertemplate{quotation end}
   \endbeamercolorbox
   \endactionenv%
@@ -653,7 +657,8 @@
 \renewenvironment<>{quote}[1][]
 { \def\insertquoteauthor{#1}
   \actionenv#2%
-  \beamercolorbox[vmode]{quote}%
+  \setlength{\beamer@quotation@tmp}{\linewidth}
+  \beamercolorbox[vmode,wd=\linewidth]{quote}%
   \usebeamertemplate{quote begin}%
   \usebeamerfont*{quote}%
   \usebeamercolor{quote}%
@@ -678,6 +683,7 @@
 {%
   \usebeamertemplate{quote author}
   \endlist
+  \setlength{\linewidth}{\beamer@quotation@tmp}
   \usebeamertemplate{quote end}
   \endbeamercolorbox%
   \endactionenv%
@@ -695,7 +701,8 @@
 
 \renewenvironment<>{verse}
 { \actionenv#1%
-  \beamercolorbox[vmode]{verse}
+  \setlength{\beamer@quotation@tmp}{\linewidth}
+  \beamercolorbox[vmode,wd=\linewidth]{verse}
   \usebeamertemplate{verse begin}
   \usebeamerfont*{verse}%
   \usebeamercolor{verse}%
@@ -708,6 +715,7 @@
 }
 {%
   \endlist
+  \setlength{\linewidth}{\beamer@quotation@tmp}
   \usebeamertemplate{verse end}
   \endbeamercolorbox
   \endactionenv%
@@ -774,13 +782,13 @@
   \fi%
   \vfill\vfill\vfill
   % title:
-  \begin{beamercolorbox}{title}
+  \begin{beamercolorbox}[wd=\linewidth]{title}
     \usebeamerfont{title}\inserttitle\par%
   \end{beamercolorbox}%
   % subtitle:
   \ifx\insertsubtitle\@empty\else%
     \vspace{1ex}
-    \begin{beamercolorbox}{subtitle}
+    \begin{beamercolorbox}[wd=\linewidth]{subtitle}
       \usebeamerfont{subtitle}\insertsubtitle\par%
     \end{beamercolorbox}%
   \fi%
@@ -788,13 +796,13 @@
   \usebeamertemplate{title page title line}%
   \vfill
   % author:
-  \begin{beamercolorbox}{author}
+  \begin{beamercolorbox}[wd=\linewidth]{author}
     \usebeamertemplate{title page author and}%
     \usebeamerfont{author}\insertauthor
   \end{beamercolorbox}
   \vfill
   % institute and date:
-  \begin{beamercolorbox}{institute}
+  \begin{beamercolorbox}[wd=\linewidth]{institute}
     \usebeamertemplate{title page institute and}%
     \usebeamerfont{institute}\insertinstitute
     \hfill
@@ -826,13 +834,13 @@
   \fi%
   \vfill\vfill\vfill
   % title:
-  \begin{beamercolorbox}[center]{title}
+  \begin{beamercolorbox}[wd=\linewidth,center]{title}
     \usebeamerfont{title}\inserttitle\par%
   \end{beamercolorbox}%
   % subtitle:
   \ifx\insertsubtitle\@empty\else%
     \vspace{1ex}
-    \begin{beamercolorbox}[center]{subtitle}
+    \begin{beamercolorbox}[wd=\linewidth,center]{subtitle}
       \usebeamerfont{subtitle}\insertsubtitle\par%
     \end{beamercolorbox}%
   \fi%
@@ -840,13 +848,13 @@
   \usebeamertemplate{title page title line}%
   \vfill
   % author:
-  \begin{beamercolorbox}[center]{author}
+  \begin{beamercolorbox}[wd=\linewidth,center]{author}
     \usebeamertemplate{title page author and}%
     \usebeamerfont{author}\insertauthor
   \end{beamercolorbox}
   \vfill
   % institute and date:
-  \begin{beamercolorbox}[center]{institute}
+  \begin{beamercolorbox}[wd=\linewidth,center]{institute}
     \usebeamertemplate{title page institute and}%
     \usebeamerfont{institute}\insertinstitute
     \hfill