diff --git a/testfiles/simple.tlg b/testfiles/simple.tlg
index d14a03a..a0187e6 100644
--- a/testfiles/simple.tlg
+++ b/testfiles/simple.tlg
@@ -3,20 +3,20 @@ Don't change this file in any respect.
 [1
 ] [2
 ]
-LaTeX Font Info:    Trying to load font information for T1+cmtt on input line ....
+LaTeX Font Info:    Trying to load font information for T1+lmtt on input line ....
 Package microtype Info: Loading generic protrusion settings for font family
-(microtype)             `cmtt' (encoding: T1).
+(microtype)             `lmtt' (encoding: T1).
 (microtype)             For optimal results, create family-specific settings.
 (microtype)             See the microtype manual for details.
-LaTeX Font Info:    Font shape `T1/cmtt/bx/n' in size <24.88> not available
-(Font)              Font shape `T1/cmtt/m/n' tried instead on input line ....
+LaTeX Font Info:    Font shape `T1/lmtt/bx/n' in size <24.88> not available
+(Font)              Font shape `T1/lmtt/b/n' tried instead on input line ....
 [1] [2
 ]
 Chapter 1.
 [3]
-LaTeX Font Info:    Trying to load font information for T1+cmss on input line ....
+LaTeX Font Info:    Trying to load font information for T1+lmss on input line ....
 Package microtype Info: Loading generic protrusion settings for font family
-(microtype)             `cmss' (encoding: T1).
+(microtype)             `lmss' (encoding: T1).
 (microtype)             For optimal results, create family-specific settings.
 (microtype)             See the microtype manual for details.
 Package mdframed Info: mdframed works in twoside mode on input line ....
@@ -26,75 +26,75 @@ Package mdframed Info: mdframed inside a box
  mdframed uses option nobreak mdframed on input line ....
 LaTeX Warning: Reference `mdf@pagelabel-1' on page 4 undefined on input line ....
 Underfull \hbox (badness 10000) in paragraph at lines 14--16
-\T1/cmr/m/n/10.95 (+20) This is a very in-ter-est-ing book about com-put-ers.
-\hbox(7.54149+2.12863)x307.1475, glue set 5.75014
-.\kern-0.39197 (left margin)
-.\T1/cmr/m/n/10.95 (+20) T
-.\T1/cmr/m/n/10.95 (+20) h
-.\T1/cmr/m/n/10.95 (+20) i
-.\T1/cmr/m/n/10.95 (+20) s
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) i
-.\T1/cmr/m/n/10.95 (+20) s
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) a
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) v
-.\kern-0.30225
-.\T1/cmr/m/n/10.95 (+20) e
-.\T1/cmr/m/n/10.95 (+20) r
-.\T1/cmr/m/n/10.95 (+20) y
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) i
+\T1/lmr/m/n/10.95 (+20) This is a very in-ter-est-ing book about com-put-ers.
+\hbox(7.54317+2.12914)x307.1475, glue set 5.60234
+.\kern-0.3942 (left margin)
+.\T1/lmr/m/n/10.95 (+20) T
+.\T1/lmr/m/n/10.95 (+20) h
+.\T1/lmr/m/n/10.95 (+20) i
+.\T1/lmr/m/n/10.95 (+20) s
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) i
+.\T1/lmr/m/n/10.95 (+20) s
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) a
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) v
+.\kern-0.30418
+.\T1/lmr/m/n/10.95 (+20) e
+.\T1/lmr/m/n/10.95 (+20) r
+.\T1/lmr/m/n/10.95 (+20) y
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) i
 .\discretionary replacing 2
-..\T1/cmr/m/n/10.95 (+20) n
-..\T1/cmr/m/n/10.95 (+20) -
-.\T1/cmr/m/n/10.95 (+20) n
-.\kern-0.30225
-.\T1/cmr/m/n/10.95 (+20) t
-.\T1/cmr/m/n/10.95 (+20) e
-.\T1/cmr/m/n/10.95 (+20) r
+..\T1/lmr/m/n/10.95 (+20) n
+..\T1/lmr/m/n/10.95 (+20) -
+.\T1/lmr/m/n/10.95 (+20) n
+.\kern-0.30418
+.\T1/lmr/m/n/10.95 (+20) t
+.\T1/lmr/m/n/10.95 (+20) e
+.\T1/lmr/m/n/10.95 (+20) r
 .\discretionary
-..\T1/cmr/m/n/10.95 (+20) -
-.\T1/cmr/m/n/10.95 (+20) e
-.\T1/cmr/m/n/10.95 (+20) s
-.\T1/cmr/m/n/10.95 (+20) t
+..\T1/lmr/m/n/10.95 (+20) -
+.\T1/lmr/m/n/10.95 (+20) e
+.\T1/lmr/m/n/10.95 (+20) s
+.\T1/lmr/m/n/10.95 (+20) t
 .\discretionary
-..\T1/cmr/m/n/10.95 (+20) -
-.\T1/cmr/m/n/10.95 (+20) i
-.\T1/cmr/m/n/10.95 (+20) n
-.\T1/cmr/m/n/10.95 (+20) g
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) b
-.\kern0.30223
-.\T1/cmr/m/n/10.95 (+20) o
-.\kern0.30223
-.\T1/cmr/m/n/10.95 (+20) o
-.\T1/cmr/m/n/10.95 (+20) k
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) a
-.\T1/cmr/m/n/10.95 (+20) b
-.\kern0.30223
-.\T1/cmr/m/n/10.95 (+20) o
-.\T1/cmr/m/n/10.95 (+20) u
-.\T1/cmr/m/n/10.95 (+20) t
-.\glue 3.63054 plus 1.81337 minus 1.20892
-.\T1/cmr/m/n/10.95 (+20) c
-.\T1/cmr/m/n/10.95 (+20) o
-.\T1/cmr/m/n/10.95 (+20) m
+..\T1/lmr/m/n/10.95 (+20) -
+.\T1/lmr/m/n/10.95 (+20) i
+.\T1/lmr/m/n/10.95 (+20) n
+.\T1/lmr/m/n/10.95 (+20) g
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) b
+.\kern0.30417
+.\T1/lmr/m/n/10.95 (+20) o
+.\kern0.30417
+.\T1/lmr/m/n/10.95 (+20) o
+.\T1/lmr/m/n/10.95 (+20) k
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) a
+.\T1/lmr/m/n/10.95 (+20) b
+.\kern0.30417
+.\T1/lmr/m/n/10.95 (+20) o
+.\T1/lmr/m/n/10.95 (+20) u
+.\T1/lmr/m/n/10.95 (+20) t
+.\glue 3.65 plus 1.825 minus 1.21666
+.\T1/lmr/m/n/10.95 (+20) c
+.\T1/lmr/m/n/10.95 (+20) o
+.\T1/lmr/m/n/10.95 (+20) m
 .\discretionary
-..\T1/cmr/m/n/10.95 (+20) -
-.\T1/cmr/m/n/10.95 (+20) p
-.\T1/cmr/m/n/10.95 (+20) u
-.\T1/cmr/m/n/10.95 (+20) t
+..\T1/lmr/m/n/10.95 (+20) -
+.\T1/lmr/m/n/10.95 (+20) p
+.\T1/lmr/m/n/10.95 (+20) u
+.\T1/lmr/m/n/10.95 (+20) t
 .\discretionary
-..\T1/cmr/m/n/10.95 (+20) -
-.\T1/cmr/m/n/10.95 (+20) e
-.\T1/cmr/m/n/10.95 (+20) r
-.\T1/cmr/m/n/10.95 (+20) s
-.\T1/cmr/m/n/10.95 (+20) .
+..\T1/lmr/m/n/10.95 (+20) -
+.\T1/lmr/m/n/10.95 (+20) e
+.\T1/lmr/m/n/10.95 (+20) r
+.\T1/lmr/m/n/10.95 (+20) s
+.\T1/lmr/m/n/10.95 (+20) .
 .\penalty 10000
-.\kern-2.12314 (right margin)
+.\kern-2.1243 (right margin)
 .\glue(\parfillskip) 0.0
 .\glue(\rightskip) 0.0
 [4]
diff --git a/yb-book.dtx b/yb-book.dtx
index 1fc2724..1ff17cc 100644
--- a/yb-book.dtx
+++ b/yb-book.dtx
@@ -274,6 +274,7 @@ Hello, world!
 \LoadClass{book}
 %    \end{macrocode}
 
+% \begin{macro}{geometry}
 % Then, using |geometry|, we setup page layout:
 %    \begin{macrocode}
 \RequirePackage{geometry}
@@ -287,11 +288,13 @@ Hello, world!
   \fi
 \fi\makeatother
 %    \end{macrocode}
+% \end{macro}
 
 % Then, we configure input encoding for UTF-8:
 %    \begin{macrocode}
 \RequirePackage[T1]{fontenc}
 \RequirePackage[utf8]{inputenc}
+\RequirePackage{lmodern}
 %    \end{macrocode}
 
 % Then, we load many important packages:
@@ -317,11 +320,14 @@ Hello, world!
 \RequirePackage[autostyle=try]{csquotes}
 %    \end{macrocode}
 
+% \begin{macro}{\pagestyle}
 % Then, we set the layout of a page to |plain|:
 %    \begin{macrocode}
 \pagestyle{plain}
 %    \end{macrocode}
+% \end{macro}
 
+% \begin{macro}{setspace}
 % Then, using |setspace| package we set the spacing between lines in the text,
 % depending on the package options:
 %    \begin{macrocode}
@@ -331,7 +337,9 @@ Hello, world!
   \makeatletter\ifyb@compact\setstretch{1.0}\fi\makeatother
   \makeatletter\ifyb@manuscript\setstretch{1.1}\fi\makeatother
 %    \end{macrocode}
+% \end{macro}
 
+% \begin{macro}{biblatex}
 % Then, we configure |biblatex|, for citation management:
 %    \begin{macrocode}
 \RequirePackage[indexing=cite,style=authoryear,
@@ -358,6 +366,7 @@ Hello, world!
     {\multicitedelim}
     {\usebibmacro{postnote}}
 %    \end{macrocode}
+% \end{macro}
 
 % \begin{macro}{condensed}
 % Then, we define |condensed| environment for snippets
@@ -369,19 +378,23 @@ Hello, world!
 %    \end{macrocode}
 % \end{macro}
 
+% \begin{macro}{microtype}
 % Then, we include |microtype| for better rendering:
 %    \begin{macrocode}
 \makeatletter\ifyb@draft\else
   \RequirePackage[letterspace=-50]{microtype}
 \fi\makeatother
 %    \end{macrocode}
+% \end{macro}
 
+% \begin{macro}{libertine}
 % Then, we include |libertine|, for a good looking font:
 %    \begin{macrocode}
 \makeatletter\ifyb@manuscript
   \RequirePackage[tt=false,type1=true]{libertine}
 \fi\makeatother
 %    \end{macrocode}
+% \end{macro}
 
 % \begin{macro}{\section}
 % Then, we redefine |\section| command: