diff --git a/assets/acronyms.tex b/assets/acronyms.tex
index 944524a..a6e6aaa 100644
--- a/assets/acronyms.tex
+++ b/assets/acronyms.tex
@@ -1,8 +1,9 @@
-\newacronym[see={[Glossary:]{gls-cbls}}]{cbls}{CBLS}{Constraint-Based Local Search\glsadd{gls-cbls}}
-\newacronym[see={[Glossary:]{gls-cp}}]{cp}{CP}{Constraint Programming\glsadd{gls-cp}}
-\newacronym[see={[Glossary:]{gls-cse}}]{cse}{CSE}{Common Subexpression Elimination\glsadd{gls-cse}}
-\newacronym[see={[Glossary:]{gls-csp}}]{csp}{CSP}{Constraint Satisfaction Problem\glsadd{gls-csp}}
-\newacronym[see={[Glossary:]{gls-cop}}]{cop}{COP}{Constraint Optimisation Problem\glsadd{gls-cop}}
-\newacronym[see={[Glossary:]{gls-lns}}]{lns}{LNS}{Large Neighbourhood Search\glsadd{gls-lns}}
-\newacronym[see={[Glossary:]{gls-mip}}]{mip}{MIP}{Mixed Integer Programming\glsadd{gls-mip}}
-\newacronym[see={[Glossary:]{gls-sat}}]{sat}{SAT}{Boolean Satisfiability\glsadd{gls-sat}}
+\newacronym[see={[Glossary:]{gls-cbls}}]{cbls}{CBLS\glsadd{gls-cbls}}{Constraint-Based Local Search}
+\newacronym[see={[Glossary:]{gls-clp}}]{clp}{CLP\glsadd{gls-clp}}{Constraint Logic Programming}
+\newacronym[see={[Glossary:]{gls-cp}}]{cp}{CP\glsadd{gls-cp}}{Constraint Programming}
+\newacronym[see={[Glossary:]{gls-cse}}]{cse}{CSE\glsadd{gls-cse}}{Common Subexpression Elimination}
+\newacronym[see={[Glossary:]{gls-csp}}]{csp}{CSP\glsadd{gls-csp}}{Constraint Satisfaction Problem}
+\newacronym[see={[Glossary:]{gls-cop}}]{cop}{COP\glsadd{gls-cop}}{Constraint Optimisation Problem}
+\newacronym[see={[Glossary:]{gls-lns}}]{lns}{LNS\glsadd{gls-lns}}{Large Neighbourhood Search}
+\newacronym[see={[Glossary:]{gls-mip}}]{mip}{MIP\glsadd{gls-mip}}{Mixed Integer Programming}
+\newacronym[see={[Glossary:]{gls-sat}}]{sat}{SAT\glsadd{gls-sat}}{Boolean Satisfiability}
diff --git a/assets/glossary.tex b/assets/glossary.tex
index 6bb1ecf..b41890b 100644
--- a/assets/glossary.tex
+++ b/assets/glossary.tex
@@ -12,173 +12,142 @@
 
 \newglossaryentry{gls-cbls}{
   name={constraint-based local search},
-  description={\jip{todo}},
+  description={},
 }
 
 
 \newglossaryentry{constraint}{
   name={constraint},
-  description={A constraint is a relationship between two or more decision
-variables or problem parameters that has to present in any valid solution to a
-problem},
+  description={},
 }
 
 \newglossaryentry{constraint-modelling}{
   name={constraint modelling},
-  description={Constraint modelling is a technique used to describe
-combinatorial problems. In this paradigm the problem in terms of
-\glspl{variable} that have an unknown value, but are potentially
-subject to certain \glspl{constraint}},
+  description={},
 }
 
 \newglossaryentry{gls-cp}{
   name={constraint programming},
-  description={Constraint Programming (CP) is a paradigm used to solve
-combinatorial problems. Its distinctive features are the declarative way in
-which the user creates a problem description, in this thesis referred to as
-\gls{constraint-modelling}, and its backtracking search that employs
-\gls{propagation} and customisable search heuristics},
+  description={},
+}
+
+\newglossaryentry{gls-clp}{
+  name={constraint logic programming},
+  description={},
 }
 
 \newglossaryentry{gls-cse}{
   name={common subexpression elimination},
-  description={Common Subexpression Elimination (CSE) is a technique used in the
-evaluation of programming languages to avoid redoing the same work. A
-description of how CSE works in \cmls\ can be found in \cref{sec:4-cse}},
+  description={},
 }
 
 \newglossaryentry{gls-csp}{
   name={constraint satisfaction problem},
-  description={TODO},
+  description={},
 }
 
 \newglossaryentry{gls-cop}{
   name={constraint optimisation problem},
-  description={TODO},
+  description={},
 }
 
 \newglossaryentry{variable}{
   name={decision variable},
-  description={A decision variable is a value that is yet to be determined. A
-problem defined as a constraint model is solved by assigning a value to each
-variable that does not violate any constraints in the model and, in case of an
-optimisation problem, optimises the objective function},
+  description={},
 }
 
 \newglossaryentry{domain}{
   name={domain},
-  description={The domain of a \gls{variable} is the set of values that
-it can still take to arrive at a solution to the problem.},
+  description={},
 }
 
 \newglossaryentry{flatzinc}{
   name={Flat\-Zinc},
-  description={A subset of the \minizinc\ syntax that is used as input for
-\glspl{solver}},
+  description={},
 }
 
 \newglossaryentry{global}{
   name={global constraint},
-  description={A global constraint is a common \gls{constraint} pattern that can
-be described using simpler \glspl{constraint}. \Glspl{solver} sometimes provide
-dedicated algorithms or rewriting rules to better handle the global constraint},
+  description={},
 }
 
 \newglossaryentry{linear-programming}{
   name={linear programming},
-  description={Linear programming is a method to optimise an linear objective
-function under the condition of a set of constraints which are all in the form
-of linear equations},
+  description={},
 }
 
 \newglossaryentry{gls-lns}{
   name={large neighbourhood search},
-  description={Large Neighbourhood Search (LNS) is a meta-search algorithm that
-repeatedly restricts the search space, \ie applying a \gls{neighbourhood}, to
-quickly find better solutions to a problem},
+  description={},
 }
 
 \newglossaryentry{meta-search}{
   name={meta-search},
   plural={meta-searches},
-  description={A search approach that repeatedly solves constraint models},
+  description={},
 }
 
 \newglossaryentry{microzinc}{
   name={Micro\-Zinc},
-  description={TODO},
+  description={},
 }
 
 \newglossaryentry{minisearch}{
   name={Mini\-Search},
-  description={TODO},
+  description={},
 }
 
 \newglossaryentry{minizinc}{
   name={Mini\-Zinc},
-  description={A high-level \gls{constraint-modelling} language with an
-extensive library of \glspl{global}},
+  description={},
 }
 
 \newglossaryentry{gls-mip}{
   name={Mixed Integer Programming},
-  description={A form of \gls{linear-programming} where at least one of the variable
-can only take an integer value},
+  description={},
 }
 
 \newglossaryentry{nanozinc}{
   name={Nano\-Zinc},
-  description={TODO},
+  description={},
 }
 
 \newglossaryentry{neighbourhood}{
   name={neighbourhood},
-  description={A neighbourhood is a restriction of the search space of the
-\gls{solver}},
+  description={},
 }
 
 \newglossaryentry{objective}{
   name={objective},
-  description={The objective in a constraint model is a designated
-\gls{variable} or function. The goal of the solver is to find the solution that
-maximises or minimises the valuation of the objective}
+  description={},
 }
 
 \newglossaryentry{restart}{
   name={restart},
-  description={A restart takes place when a \gls{solver} abandons its current
-search position and start its search from the beginning},
+  description={},
 }
 
 \newglossaryentry{gls-sat}{
   name={boolean satisfiability},
-  description={\jip{todo}},
+  description={},
 }
 
 \newglossaryentry{solver}{
   name={solver},
-  description={A solver is a dedicated program or algorithm that can be used to
-solve combinatorial problems, or a subset thereof},
+  description={},
 }
 
 \newglossaryentry{parameter}{
   name={problem parameter},
-  description={A problem parameter is a constant value that helps define the
-problem. Its value can differ among different problem instances. Its exact value
-must be known when rewriting a constraint model, but is not required when
-compiling a constraint model into a executable program},
+  description={},
 }
 
 \newglossaryentry{propagation}{
   name={constraint propagation},
-  description={Constraint propagation is the inference that
-\glspl{variable} can no longer take a certain values, lest they would
-violate a \gls{constraint}},
+  description={},
 }
 
 \newglossaryentry{reification}{
   name={reification},
-  description={Instead of enforcing a particular relationship, a reification of
-a constraint predicate will report whether a relationship is present in the
-solution},
+  description={},
 }
diff --git a/assets/packages.tex b/assets/packages.tex
index 6c1cc50..02c3101 100644
--- a/assets/packages.tex
+++ b/assets/packages.tex
@@ -56,6 +56,7 @@ style=apa,
 
 % Glossary / Acronyms
 \usepackage[acronym,toc]{glossaries}
+\usepackage[stylemods=bookindex]{glossaries-extra}
 \usepackage{titlecaps}
 \glsdisablehyper{}
 \defglsentryfmt[main]{\ifglsused{\glslabel}{\glsgenentryfmt}{\textit{\glsgenentryfmt}}}
@@ -128,6 +129,7 @@ style=apa,
 \usepackage[
 cachedir=listings,
 outputdir=build,
+draft=true,
 ]{minted}
 \usemintedstyle{borland}
 
diff --git a/dekker_thesis.tex b/dekker_thesis.tex
index 8e8abce..def621b 100644
--- a/dekker_thesis.tex
+++ b/dekker_thesis.tex
@@ -116,6 +116,6 @@ following publication:
 
 \printglossary[nonumberlist,type=\acronymtype]{}
 \renewcommand{\glsnamefont}[1]{\titlecap{#1}}
-\printglossary[nonumberlist]{}
+\printglossary[style=bookindex,title=Index]{}
 
 \end{document}