diff --git a/content/background/sample-section.tex b/content/background/sample-section.tex
index 56792bf..97f36ae 100644
--- a/content/background/sample-section.tex
+++ b/content/background/sample-section.tex
@@ -1,8 +1,8 @@
 \section{Monte Carlo Radiation Transport}
 \label{sec:bg:mc}
 
-Blah blah blah.. background information in a section with equations and a reference to \ac{mcnp} \cite{mcnp5-theory}.
-Also we used the $\backslash ac \{ \}$ command to write \ac{mcnp}.
+Blah blah blah.. background information in a section with equations and a reference to \gls{mcnp} \cite{mcnp5-theory}.
+Also we used the $\backslash gls \{ \}$ command to write \gls{mcnp}.
 Now we will also refer to \cref{bg:eq:fom} without having to actually type out the word ``Equation" by using $\backslash cref \{ \}$.
 We can do the same for referring to \cref{sec:bg:vr} that appears below this.
 Also try clicking on the section number in the last sentence.
diff --git a/content/intro/intro.tex b/content/intro/intro.tex
index 8bb2a67..d4db0b7 100644
--- a/content/intro/intro.tex
+++ b/content/intro/intro.tex
@@ -3,6 +3,6 @@ \chapter{Introduction}
 First example of content is this introduction.
 It is listed as a chapter and included in the main .tex document.
 
-Let's use some acronyms just so they appear in our list in the 
-frontmatter. I work with the Direct Accelerated Geometry Monte Carlo
-(\ac{dagmc}) toolkit. It couples with the Monte Carlo N-Particle (\ac{mcnp}) code and it uses oriented bounding boxes (\ac{obb}s).
+Let's use some acronyms just so they appear in our list in the frontmatter.
+I work with the \gls{dagmc} toolkit.
+It couples with the \gls{mcnp} code and it uses \gls{obb}.
diff --git a/example-thesis.pdf b/example-thesis.pdf
index aadd355..da61d18 100644
Binary files a/example-thesis.pdf and b/example-thesis.pdf differ
diff --git a/frontmatter/acronyms.tex b/frontmatter/acronyms.tex
index c5801ab..b862f44 100644
--- a/frontmatter/acronyms.tex
+++ b/frontmatter/acronyms.tex
@@ -1,22 +1,5 @@
-\acsetup{first-style=short}
-\DeclareInstance{acro-title}{empty}{sectioning}{name-format =}
+% Sample acronyms that are declared and appear in the nomenclature list
 
-%% Sample acronyms that are declared and appear in the list of acronyms
-
-\DeclareAcronym{mcnp}{
-  short = MCNP ,
-  long  = Monte Carlo N-Particle transport code ,
-  class = abbrev
-}
-
-\DeclareAcronym{dagmc}{
-  short = DAGMC ,
-  long  = Direct Accelerated Geometry Monte Carlo ,
-  class = abbrev
-}
-
-\DeclareAcronym{obb}{
-  short = OBB ,
-  long  = oriented bounding box ,
-  class = abbrev
-}
+\newacronym{mcnp}{MCNP}{Monte Carlo N-Particle transport code}
+\newacronym{dagmc}{DAGMC}{Direct Accelerated Geometry Monte Carlo}
+\newacronym{obb}{OBB}{oriented bounding box}
diff --git a/frontmatter/frontmatter.tex b/frontmatter/frontmatter.tex
index 9933fbc..ebc6998 100644
--- a/frontmatter/frontmatter.tex
+++ b/frontmatter/frontmatter.tex
@@ -56,11 +56,9 @@
 \clearpage
 \listoffigures
 
-% add list of acronyms here
 \clearpage
-\begin{nomenclature}
-\printacronyms[heading=none] %[include-classes=abbrev]
-\end{nomenclature}
+\input{frontmatter/acronyms}
+\printglossary[title={Nomenclature}, nonumberlist, nopostdot]
 
 \clearpage
 
diff --git a/includes/preamble.tex b/includes/preamble.tex
index 760040b..1d9be26 100644
--- a/includes/preamble.tex
+++ b/includes/preamble.tex
@@ -25,7 +25,9 @@
 \usepackage{amsthm} % can write math theorem type of things
 
 %% acronyms and glossaries
-\usepackage{acro} % use acronyms
+\usepackage{glossaries}
+\glstoctrue
+\makeglossaries
 
 % clever referencing package must be loaded LAST otherwise it will not work
 \usepackage[noabbrev, capitalize]{cleveref} % for clever referencing \cref{} without having to manually write the word "Figure", etc.
diff --git a/includes/thesisdefs.tex b/includes/thesisdefs.tex
index e56aa2b..3005580 100644
--- a/includes/thesisdefs.tex
+++ b/includes/thesisdefs.tex
@@ -132,33 +132,6 @@
    All Rights Reserved
   \end{center}}
 
-
-%=============================================================================
-% GLOSSARY
-%=============================================================================
-% The glossary environment must do the following:
-% - produce the table of contents entry for the glossary
-% - start a new page with GLOSSARY centered two inches from the top
-%=============================================================================
-\def\glossary{
-  \chapter*{GLOSSARY}
-  \addcontentsline{toc}{chapter}{Glossary}}
-\def\endglossary{\par\newpage}
-
-%=============================================================================
-% NOMENCLATURE
-%=============================================================================
-% The nomenclature environment must do the following:
-% - produce the table of contents entry for the nomenclature section
-% - start a new page with NOMENCLATURE centered two inches from the top
-%=============================================================================
-\def\nomenclature{%\separatorpage{DISCARD THIS PAGE}
-  \chapter*{Nomenclature}
-  \addcontentsline{toc}{chapter}{Nomenclature}}
-  \input{frontmatter/acronyms}
-\def\endnomenclature{\par\newpage}
-
-
 %=============================================================================
 % LIST OF SYMBOLS
 %=============================================================================
diff --git a/makefile b/makefile
index 1514e93..86266f3 100644
--- a/makefile
+++ b/makefile
@@ -11,7 +11,7 @@ quick: $(manuscript).tex
 all-via-pdf: $(manuscript).tex
 	mkdir -p build
 	pdflatex $(latexopt) $(manuscript)
-	# makeglossaries -d build $(manuscript)
+	makeglossaries -d build $(manuscript)
 	bibtex build/$(manuscript)
 	pdflatex $(latexopt) $(manuscript)
 	pdflatex $(latexopt) $(manuscript)