diff --git a/Makefile b/Makefile
index bd67a4524abf574594c2817f9058ec9507bfd4e3..e37299f2869e1c7ca26a1b4472266a9e61d54bed 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ MAKES=guide/mu/Makefile guide/mu/resources/Makefile \
 	style/mu/Makefile test/Makefile test/mu/blind/Makefile \
 	test/mu/compare/Makefile test/mu/compare-example/Makefile
 USEREXAMPLE_SOURCES=example/mu/Makefile example/mu/example.dtx \
-	example/mu/*.ins example/mu/latexmkrc
+	example/mu/*.ins example/mu/latexmkrc \
+	example/mu/example-terms-abbrs.tex
 USEREXAMPLES=example/mu/econ-lualatex.pdf \
 	example/mu/econ-pdflatex.pdf example/mu/fi-lualatex.pdf \
 	example/mu/fi-pdflatex.pdf example/mu/fsps-lualatex.pdf \
diff --git a/example/mu/Makefile b/example/mu/Makefile
index 9ec6709b7d1860e95f2270bd465c56747d13ae6a..9deda36495297da4af4104722b0af95621beb503 100644
--- a/example/mu/Makefile
+++ b/example/mu/Makefile
@@ -21,7 +21,7 @@ all: $(OUTPUT) clean
 		$(patsubst %-pdflatex.tex,%-,$(subst lua,pdf,$@))*.tex
 
 # This target typesets a pdfLaTeX example.
-%-pdflatex.pdf: %-pdflatex.tex example.bib
+%-pdflatex.pdf: %-pdflatex.tex example.bib example-terms-abbrs.tex
 	$(PDFLATEX) $< # The initial typesetting.
 	biber                               $(basename $<).bcf
 	$(PDFLATEX) $< # Update the index after the bibliography insertion.
@@ -30,7 +30,7 @@ all: $(OUTPUT) clean
 	$(PDFLATEX) $<
 
 # This target typesets a LuaLaTeX example.
-%-lualatex.pdf: %-lualatex.tex example.bib
+%-lualatex.pdf: %-lualatex.tex example.bib example-terms-abbrs.tex
 	$(LUALATEX) $< # The initial typesetting.
 	biber                               $(basename $<).bcf
 	$(LUALATEX) $< # Update the index after the bibliography insertion.
diff --git a/example/mu/example-terms-abbrs.tex b/example/mu/example-terms-abbrs.tex
new file mode 100644
index 0000000000000000000000000000000000000000..82bec469a4b8cdd8c54305b511d1d5244146eb98
--- /dev/null
+++ b/example/mu/example-terms-abbrs.tex
@@ -0,0 +1,12 @@
+% These are examples for entries in Dictionary of Terms 
+% and List of Abbreviations
+
+% Example of Dictionary entry
+\newglossaryentry{Overleaf}
+{
+    name=Overleaf,
+    description={is an online service for working with LaTex files.}
+}
+
+% Example of LoA entry
+\newacronym{MUNI}{MUNI}{Masaryk University}
diff --git a/example/mu/example.dtx b/example/mu/example.dtx
index 022d9225d6c1a76129f6c04d3daecfa3200a350c..1d9a6f40ded74d8196089a7aeda49f3c44b325a7 100644
--- a/example/mu/example.dtx
+++ b/example/mu/example.dtx
@@ -510,8 +510,16 @@
 %%    assignment         = assignment.pdf,
 }
 %</sci>
+%    \end{macrocode}
+% \changes{v1.0.0}{2021/03/22}{Added \textsf{glossaries} package.
+%    [TV]}
+%    \begin{macrocode}
 \usepackage{makeidx}      %% The `makeidx` package contains
 \makeindex                %% helper commands for index typesetting.
+\usepackage[acronym]{glossaries}          %% The `glossaries` package
+\renewcommand*\glspostdescription{\hfill} %% contains helper commands
+\loadglsentries{example-terms-abbrs.tex}  %% for dict and loa
+\makenoidxglossaries                      %% typesetting.
 %% These additional packages are used within the document:
 \usepackage{paralist} %% Compact list environments
 \usepackage{amsmath}  %% Mathematics
@@ -544,6 +552,18 @@
 \makeatother
 
 %</econ>
+%    \end{macrocode}
+% \changes{v1.0.0}{2021/03/22}{Added \cs{printnoidxglossary} to print
+%   Dictionary and List of Abbreviations. [TV]}
+%    \begin{macrocode}
+%% Uncomment the following lines (by removing the %% at the beginning)
+%% and to print out List of Abbreviations and/or Dictionary in your
+%% document. Titles for these tables can be changed by replacing the
+%% titles `Abbreviations` and `Dictionary`, respectively.
+%% \clearpage
+%% \printnoidxglossary[title={Abbreviations}, type=\acronymtype]
+%% \printnoidxglossary[title={Dictionary}]
+
 \chapter*{Introduction}
 \addcontentsline{toc}{chapter}{Introduction}
 
@@ -885,7 +905,7 @@ proofs.
 %<*econ>
   \emph{Source: <<Image Source>>}
 %</econ>
-  \caption{The logo of the Masaryk University at $\frac23$ and
+	\caption{The logo of the \acrlong{MUNI} at $\frac23$ and
     $\frac13$ of text width}
   \label{fig:mulogo2}
 \end{figure}
@@ -947,7 +967,7 @@ run of
 \texttt{lualatex \jobname.tex}
 %</luatex>
 and a second run is going to be needed for the references to
-resolve. With online services -- such as Overleaf -- this is
+resolve. With online services -- such as \Gls{Overleaf} -- this is
 performed automatically.
 
 \chapter{Mathematical equations}
diff --git a/fithesis.dtx b/fithesis.dtx
index 5285f5ea64a0ca03a01ac8517170b8919afa7c35..e3fd80d0d0e2ad00c678a607ed7c1b8cd711b59c 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -19,6 +19,7 @@
 \usepackage{paralist}
 \usepackage{multicol}
 
+
 % Making paragraphs numbered
 \makeatletter
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
@@ -1260,6 +1261,7 @@
 % When the |\thesis@assignmentFiles| macro is defined and
 % non-empty, the style files should take that as a cue that the
 % user wishes to typeset the thesis assignment.
+
 % \begin{macro}{\thesis@bibFiles}
 % \subsubsection{The \texttt{bib} key}
 % The \marg{\texttt{bib}=list} pair sets the comma-delimited