diff --git a/beamercolorthemeaptero.sty b/beamercolorthemeaptero.sty
index 3c178a3..f99fe61 100644
--- a/beamercolorthemeaptero.sty
+++ b/beamercolorthemeaptero.sty
@@ -88,14 +88,14 @@
 \setbeamercolor{quote}{parent=normal text, bg=black!15}
 \setbeamercolor{quote symbol}{fg=red}
 \setbeamercolor{quote source}{parent=quote}
-\setbeamercolor{quote line top}{fg=red}
-\setbeamercolor{quote line bottom}{fg=red}
+\setbeamercolor{quote line top}{fg=}
+\setbeamercolor{quote line bottom}{fg=}
 
 \setbeamercolor{quotation}{parent=normal text, bg=black!15}
 \setbeamercolor{quotation source}{parent=quote}
 \setbeamercolor{quotation symbol}{fg=blue}
-\setbeamercolor{quotation line top}{fg=blue}
-\setbeamercolor{quotation line bottom}{fg=blue}
+\setbeamercolor{quotation line top}{fg=}
+\setbeamercolor{quotation line bottom}{fg=}
 
 \setbeamercolor{section in toc}{parent={normal text}}
 \setbeamercolor{subsection in toc}{parent={normal text}}
diff --git a/beamerthemelines.sty b/beamerthemelines.sty
index 1546702..a9c87f3 100644
--- a/beamerthemelines.sty
+++ b/beamerthemelines.sty
@@ -519,8 +519,8 @@
   \usebeamertemplate{verse begin}
   \usebeamerfont*{verse}%
   \list{}{
-    \leftmargin    2em
-    \rightmargin   2em
+    \leftmargin    2.5em
+    \rightmargin   2.5em
     \parsep        1ex
   }%
   \item\relax
@@ -691,17 +691,17 @@
   \setbox0=\hbox{\usebeamertemplate{quote symbol}\unskip}%
   \ifdim\wd0=0pt
     \list{}{
-      \leftmargin    1em
-      \rightmargin   1em
-      \parsep        0.2ex
+      \leftmargin    2.5em
+      \rightmargin   2.5em
+      \parsep        1ex
     }%
     \item\relax%
   \else
     \list{}{
       \leftmargin    2.5em
-      \rightmargin   2em
+      \rightmargin   2.5em
       \labelsep      1.5ex
-      \parsep        0.2ex
+      \parsep        1ex
     }%
     \item[\usebeamertemplate{quote symbol}]\relax%
   \fi%
diff --git a/lines-example.tex b/lines-example.tex
index 47c7cb0..0aebb1b 100644
--- a/lines-example.tex
+++ b/lines-example.tex
@@ -360,11 +360,13 @@
     Here we even start a second paragraph.
   \end{quotation}
   \vfill
-  Quote something else of somebody else (empty source argument):
-  \begin{quote}
-    A \verb!quote! environment.
-
-    With a second line.
+  Quote something else of somebody else:
+  \begin{quote}[Me And Myself]
+    A \verb!quote! environment. There is a lot to talk about and
+    it really takes a lot of words to express this. Most likely this
+    does not fit into a single line.
+    
+    Here we even start a second paragraph.
   \end{quote}
   \vfill
   Here is a poem:
@@ -386,7 +388,7 @@
     \texttt{\textbackslash setbeamertemplate\{quote symbol\}[#1]}
   \end{small}
   \quotedemo
-  \setbeamertemplate{quote symbol}[closequote]
+  \setbeamertemplate{quote symbol}[openquote]
 }
 
 \newcommand{\quotesymbolfontdemo}[1]{
@@ -400,11 +402,12 @@
 
 \begin{frame}[fragile]{Quote symbol settings}
   \quotesymboldemo{default}
-  \quotesymboldemo{openquote}
   \quotesymboldemo{closequote}
+  \quotesymboldemo{openquote}
   \quotesymbolfontdemo{phv}
   \quotesymbolfontdemo{pnc}
-  \quotesymbolfontdemo{qcs}
+  \quotesymbolfontdemo{pbk}
+  %\quotesymbolfontdemo{qcs}
 \end{frame}
 
 \newcommand{\quotesourcedemo}[1]{
@@ -413,6 +416,7 @@
     \texttt{\textbackslash setbeamertemplate\{quote source\}[#1]}
   \end{small}
   \quotedemo
+  \setbeamertemplate{quote source}[rightline]
 }
 
 \begin{frame}[fragile]{Source settings for quote and quotation environments}
@@ -469,7 +473,6 @@
   \quotecolordemo{}{blue}
   \quotecolordemo{red}{blue}
 \end{frame}
-
 \setbeamertemplate{quote begin}[lines][0.5pt]
 \setbeamertemplate{quote end}[lines][0.5pt]
 \setbeamercolor{quote line top}{fg=}
@@ -481,6 +484,7 @@
     \texttt{\textbackslash setbeamercolor\{quote\}\{fg=#1, bg=#2\}}\\
   \end{small}
   \quotedemo
+  \setbeamercolor{quote}{fg=normal text.fg, bg=black!15}
 }
 
 \begin{frame}[fragile]{Colors and fonts for quote and quotation environments}
@@ -490,7 +494,6 @@
   \setbeamerfont{quote}{size=\normalsize, shape=\slshape}
   \quoteboxdemo{blue}{}
   \quoteboxdemo{red}{black!15}
-  \setbeamercolor{quote}{fg=normal text.fg, bg=black!15}
   \setbeamercolor{quote symbol}{fg=green}
   {\small \verb!\setbeamercolor{quote symbol}{fg=green}!\\}
   \quotedemo
@@ -502,6 +505,7 @@
   {\small \verb!\setbeamerfont{quote source}{size=\tiny}!\\}
   \quotedemo
   \setbeamercolor{quote source}{fg=}
+  \setbeamerfont{quote source}{size=\normalsize}
 \end{frame}
  
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%