diff --git a/beamercolorthemeaptero.sty b/beamercolorthemeaptero.sty
index ec775e8..1ddcc84 100644
--- a/beamercolorthemeaptero.sty
+++ b/beamercolorthemeaptero.sty
@@ -31,106 +31,105 @@
 % inner colors:
 
 \setbeamercolor{normal text}{fg=black, bg=}
-%\setbeamercolor{math text}{parent={normal text}}  % this kills coloring of \url{}
 
 \setbeamercolor{structure}{fg=blue}
 \setbeamercolor{alerted text}{fg=red}
 
-\setbeamercolor{palette primary}{parent=alerted text}
-\setbeamercolor{palette secondary}{parent=structure}
-\setbeamercolor{palette tertiary}{parent=normal text}
+%\setbeamercolor{math text}{parent=normal text}  % this kills coloring of \url{}
 
-\setbeamercolor{titlelike}{parent=palette secondary}
+\setbeamercolor{titlelike}{parent=structure}
 
-\setbeamercolor{frametitle}{parent={titlelike}}
-\setbeamercolor{framesubtitle}{parent={titlelike}}
-\setbeamercolor{frametitle line}{parent={titlelike}}
+\setbeamercolor{frametitle}{parent=titlelike}
+\setbeamercolor{framesubtitle}{parent=titlelike}
+\setbeamercolor{frametitle line}{parent=titlelike}
 
 \setbeamercolor{item projected}{fg=white, bg=black!60}
 \setbeamercolor{subitem projected}{fg=white, bg=black!60}
 
-\setbeamercolor{itemize item}{parent={normal text}}
-\setbeamercolor{itemize item check}{parent={normal text}, fg=green}
-\setbeamercolor{itemize item uncheck}{parent={normal text}, fg=red}
-\setbeamercolor{itemize subitem}{parent={normal text}}
+\setbeamercolor{itemize item}{parent=normal text}
+\setbeamercolor{itemize item check}{parent=normal text, fg=green}
+\setbeamercolor{itemize item uncheck}{parent=normal text, fg=red}
+\setbeamercolor{itemize subitem}{parent=normal text}
 
-\setbeamercolor{enumerate item}{parent={normal text}}
-\setbeamercolor{enumerate subitem}{parent={normal text}}
+\setbeamercolor{enumerate item}{parent=normal text}
+\setbeamercolor{enumerate subitem}{parent=normal text}
 
-\setbeamercolor{block title}{fg=white, bg=palette secondary.fg}
-\setbeamercolor{block body}{fg=normal text.fg, bg=normal text.fg!15}
+\setbeamercolor{block title}{use=structure, fg=white, bg=structure.fg}
+\setbeamercolor{block body}{use=normal text, fg=normal text.fg, bg=normal text.fg!15}
 \setbeamercolor{block line top}{fg=}
-\setbeamercolor{block line middle}{fg=palette secondary.fg}
-\setbeamercolor{block line bottom}{fg=palette secondary.fg}
+\setbeamercolor{block line middle}{use=block title, fg=block title.bg}
+\setbeamercolor{block line bottom}{use=block title, fg=block title.bg}
 
-\setbeamercolor{block title alerted}{parent={block title}, bg=alerted text.fg}
-\setbeamercolor{block body alerted}{fg=alerted text.fg, bg=normal text.fg!15}
+\setbeamercolor{block title alerted}{use=alerted text, parent=block title, bg=alerted text.fg}
+\setbeamercolor{block body alerted}{use={alerted text, normal text}, fg=alerted text.fg, bg=normal text.fg!15}
 \setbeamercolor{block line alerted top}{fg=}
-\setbeamercolor{block line alerted middle}{fg=block title alerted.bg}
-\setbeamercolor{block line alerted bottom}{fg=block title alerted.bg}
+\setbeamercolor{block line alerted middle}{use=block title alerted, fg=block title alerted.bg}
+\setbeamercolor{block line alerted bottom}{use=block title alerted, fg=block title alerted.bg}
 
-\setbeamercolor{block title example}{parent={block title}, bg=lightgreen}
-\setbeamercolor{block body example}{fg=normal text.fg, bg=normal text.fg!15}
+\setbeamercolor{block title example}{parent=block title, bg=lightgreen}
+\setbeamercolor{block body example}{use=normal text, fg=normal text.fg, bg=normal text.fg!15}
 \setbeamercolor{block line example top}{fg=}
-\setbeamercolor{block line example middle}{fg=block title example.bg}
-\setbeamercolor{block line example bottom}{fg=block title example.bg}
+\setbeamercolor{block line example middle}{use=block title example, fg=block title example.bg}
+\setbeamercolor{block line example bottom}{use=block title example, fg=block title example.bg}
 
-\setbeamercolor{theorem title}{parent={block title}, bg=orange}
-\setbeamercolor{theorem body}{fg=normal text.fg, bg=theorem title.bg!40}
+\setbeamercolor{theorem title}{parent=block title, bg=orange}
+\setbeamercolor{theorem body}{use={normal text, theorem title}, fg=normal text.fg, bg=theorem title.bg!40}
 \setbeamercolor{theorem line top}{fg=}
-\setbeamercolor{theorem line middle}{fg=theorem title.bg}
-\setbeamercolor{theorem line bottom}{fg=theorem title.bg}
+\setbeamercolor{theorem line middle}{use=theorem title, fg=theorem title.bg}
+\setbeamercolor{theorem line bottom}{use=theorem title, fg=theorem title.bg}
 
-\setbeamercolor{message}{parent=block title, bg=alerted text.fg}
+\setbeamercolor{message}{parent=block title alerted}
 \setbeamercolor{message line top}{fg=}
 \setbeamercolor{message line bottom}{fg=}
 \setbeamercolor{message symbol}{fg=}
-\setbeamercolor{message item}{fg=alerted text.fg}
-\setbeamercolor{message item symbol}{fg=alerted text.fg}
+\setbeamercolor{message item}{use=alerted text, fg=alerted text.fg}
+\setbeamercolor{message item symbol}{use=alerted text, fg=alerted text.fg}
 
-\setbeamercolor{verse}{parent=normal text, bg=normal text.fg!15}
-\setbeamercolor{verse line top}{fg=}
-\setbeamercolor{verse line bottom}{fg=}
+\setbeamercolor{quote environments}{use=normal text, fg=normal text.fg, bg=normal text.fg!15}
 
-\setbeamercolor{quote}{parent=normal text, bg=normal text.fg!15}
-\setbeamercolor{quote symbol}{fg=palette primary.fg}
-\setbeamercolor{quote source}{parent=quote}
+\setbeamercolor{quote}{parent=quote environments}
+\setbeamercolor{quote symbol}{parent=alerted text}
+\setbeamercolor{quote source}{}
 \setbeamercolor{quote line top}{fg=}
 \setbeamercolor{quote line bottom}{fg=}
 
-\setbeamercolor{quotation}{parent=normal text, bg=normal text!15}
-\setbeamercolor{quotation source}{parent=quotation}
-\setbeamercolor{quotation symbol}{fg=palette secondary.fg}
+\setbeamercolor{quotation}{parent=quote environments}
+\setbeamercolor{quotation symbol}{parent=structure}
+\setbeamercolor{quotation source}{}
 \setbeamercolor{quotation line top}{fg=}
 \setbeamercolor{quotation line bottom}{fg=}
 
-\setbeamercolor{section in toc}{parent={normal text}}
-\setbeamercolor{subsection in toc}{parent={normal text}}
+\setbeamercolor{verse}{parent=quote environments}
+\setbeamercolor{verse line top}{fg=}
+\setbeamercolor{verse line bottom}{fg=}
+
+\setbeamercolor{section in toc}{parent=normal text}
+\setbeamercolor{subsection in toc}{parent=normal text}
 
-\setbeamercolor{title}{parent=palette primary}
-\setbeamercolor{subtitle}{parent={title}}
-\setbeamercolor{author}{parent={normal text}}
-\setbeamercolor{institute}{parent={normal text}}
+\setbeamercolor{title}{parent=titlelike}
+\setbeamercolor{subtitle}{parent=title}
+\setbeamercolor{author}{parent=normal text}
+\setbeamercolor{institute}{parent=normal text}
 
-\setbeamercolor{title page}{parent={normal text}}
-\setbeamercolor{title page graphic line}{fg=palette primary.fg}
-\setbeamercolor{title page title line}{fg=palette primary.fg}
+\setbeamercolor{title page}{parent=normal text}
+\setbeamercolor{title page graphic line}{use=title, fg=title.fg}
+\setbeamercolor{title page title line}{use=title, fg=title.fg}
 
-\setbeamercolor{section name}{parent={titlelike}}
-\setbeamercolor{section name separator}{parent={section name}}
-\setbeamercolor{section title}{parent={titlelike}}
+\setbeamercolor{section name}{parent=structure}
+\setbeamercolor{section name separator}{parent=section name}
+\setbeamercolor{section title}{parent=titlelike}
 
-\setbeamercolor{subsection name}{parent={titlelike}}
-\setbeamercolor{subsection name separator}{parent={section name}}
-\setbeamercolor{subsection title}{parent={titlelike}}
+\setbeamercolor{subsection name}{parent=structure}
+\setbeamercolor{subsection name separator}{parent=section name}
+\setbeamercolor{subsection title}{parent=titlelike}
 
 % outer colors:
 
 \setbeamercolor{background}{bg=}
 
 \setbeamercolor{footline}{fg=black!75, bg=}
-\setbeamercolor{footline line}{parent={footline}}
-\setbeamercolor{footline separator}{parent={footline}}
+\setbeamercolor{footline line}{parent=footline}
+\setbeamercolor{footline separator}{parent=footline}
 
 % hyper ref colors:
 
diff --git a/lines-example.tex b/lines-example.tex
index 06a5f76..d218868 100644
--- a/lines-example.tex
+++ b/lines-example.tex
@@ -390,20 +390,25 @@
 }
 
 \begin{frame}[fragile]{Themes for block environments with title}
+  The box of the \texttt{default} theme extends beyond \verb!\textwidth! and the title box
+  is wider than the body box:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[default]!\\
+    \verb!\setbeamertemplate{block begin}[default]!
     \verb!\setbeamertemplate{block end}[default]!
   \end{small}
   \blockthemedemo{default}{}
   \vfill
+  The box of the \texttt{rounded} theme also extends beyond \verb!\textwidth!:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[rounded]!\\
+    \verb!\setbeamertemplate{block begin}[rounded]!
     \verb!\setbeamertemplate{block end}[rounded]!
   \end{small}
   \blockthemedemo{rounded}{}
   \vfill
+  The box of the \texttt{lines} theme is as wide as \verb!\textwidth!
+  and the title box always has the same height:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[lines]{0pt}{0pt}!\\
+    \verb!\setbeamertemplate{block begin}[lines]{0pt}{0pt}!
     \verb!\setbeamertemplate{block end}[lines]{0pt}!
   \end{small}
   \blockthemedemo{lines}{{0pt}}
@@ -421,20 +426,23 @@
 }
 
 \begin{frame}[fragile]{Themes for block environments without title}
+  The \texttt{default} theme still shows a title box:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[default]!\\
+    \verb!\setbeamertemplate{block begin}[default]!
     \verb!\setbeamertemplate{block end}[default]!
   \end{small}
   \blockthemedemo{default}{}
   \vfill
+  The \texttt{rounded} theme works as expected:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[rounded]!\\
+    \verb!\setbeamertemplate{block begin}[rounded]!
     \verb!\setbeamertemplate{block end}[rounded]!
   \end{small}
   \blockthemedemo{rounded}{}
   \vfill
+  The \texttt{lines} theme works as expected and stays within the \verb!\textwidth!:\\
   \begin{small}
-    \verb!\setbeamertemplate{block begin}[lines]{0pt}{0pt}!\\
+    \verb!\setbeamertemplate{block begin}[lines]{0pt}{0pt}!
     \verb!\setbeamertemplate{block end}[lines]{0pt}!
   \end{small}
   \blockthemedemo{lines}{{0pt}}
@@ -474,8 +482,8 @@
   \blockdemo
   \setbeamertemplate{block begin}[lines]{0.5pt}{0.5pt}
   \setbeamertemplate{block end}[lines]{0.5pt}
-  \setbeamerfont{block title}{parent={normal text}}
-  \setbeamerfont{block body}{parent={normal text}}
+  \setbeamerfont{block title}{parent=normal text}
+  \setbeamerfont{block body}{parent=normal text}
 }
 
 \begin{frame}[fragile]{Fonts for block environments}
@@ -514,16 +522,6 @@
   \vfill
 \end{frame}
 
-\setbeamertemplate{block begin}[lines]{0.5pt}{0.5pt}
-\setbeamertemplate{block end}[lines]{0.5pt}
-\setbeamercolor{block title}{fg=white, bg=blue}
-\setbeamercolor{block body}{fg=normal text.fg, bg=black!15}
-\setbeamercolor{block line top}{fg=}
-\setbeamercolor{block line middle}{fg=blue}
-\setbeamercolor{block line bottom}{fg=blue}
-\setbeamerfont{block title}{parent={normal text}}
-\setbeamerfont{block body}{parent={normal text}}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 \begin{frame}{Theorems --- for mathematicians}
   \begin{theorem}
@@ -720,6 +718,7 @@
   \setbeamercolor{quote source}{fg=blue}
   {\small \verb!\setbeamercolor{quote source}{fg=blue}!\\}
   \quotedemo
+  \setbeamercolor{quote source}{fg=}
   \setbeamerfont{quote source}{size=\footnotesize, shape=\itshape}
   {\small \verb!\setbeamerfont{quote source}{size=\footnotesize, shape=\itshape}!\\}
   \quotedemo
@@ -959,9 +958,9 @@
     \verb!\frame[plain]{\sectionpage}!
   \end{block}
   \begin{block}{Colors/Fonts}
-    \verb!\setbeamercolor{section name}{parent={titlelike}}!
-    \verb!\setbeamercolor{section name separator}{parent={section name}}!
-    \verb!\setbeamercolor{section title}{parent={titlelike}}!
+    \verb!\setbeamercolor{section name}{parent=titlelike}!
+    \verb!\setbeamercolor{section name separator}{parent=section name}!
+    \verb!\setbeamercolor{section title}{parent=titlelike}!
   \end{block}
 \end{frame}
 
@@ -981,9 +980,9 @@
   \end{block}
   \vfill
   \begin{block}{Colors/Fonts}
-    \verb!\setbeamercolor{subsection name}{parent={titlelike}}!
-    \verb!\setbeamercolor{subsection name separator}{parent={section name}}!
-    \verb!\setbeamercolor{subsection title}{parent={titlelike}}!
+    \verb!\setbeamercolor{subsection name}{parent=titlelike}!
+    \verb!\setbeamercolor{subsection name separator}{parent=section name}!
+    \verb!\setbeamercolor{subsection title}{parent=titlelike}!
   \end{block}
 \end{frame}
 
@@ -1013,7 +1012,7 @@
     the appearance of your presentation.
   \end{alertblock}
   \vfill
-  Read in the beamer user guide
+  Read the beamer user guide
   \begin{itemize}
   \item section 16.3 ``Changing the Templates Used for Different Elements of a Presentation''
   \end{itemize}