diff --git a/latex/thesis/abbreviations.tex b/latex/thesis/abbreviations.tex
index fd06e04..5bd2cf0 100644
--- a/latex/thesis/abbreviations.tex
+++ b/latex/thesis/abbreviations.tex
@@ -1,70 +1,74 @@
-% This file provides Abbreviations
-% Sorting them is a good idea because the acronym package won't!
-\chapter{Abbreviations}
-\begin{acronym}[TROLL]
-  \acro{AWGN}[AWGN]{Additive White Gaussian Noise}
-  \acro{ADMM}[ADMM]{Alternating Direction Method of Multipliers}
+%
+% A
+%
 
-  \acro{BER}[BER]{Bit Error Rate}
-  \acro{BP}[BP]{Belief Propagation}
-  \acro{BPSK}[BPSK]{Binary Phase Shift Keying}
+\DeclareAcronym{AWGN}{
+    short = AWGN,
+    long  = additive white gaussian noise
+}
 
-  \acro{FER}[FER]{Frame Error Rate}
-  
-  \acro{LP}[LP]{Linear Programming}
-  \acro{LDPC}[LDPC]{Low-Density Parity-Check}
+\DeclareAcronym{ADMM}{
+    short = ADMM,
+    long  = alternating direction method of multipliers
+}
 
-%  \acro{AGC}[AGC]{automatic gain control}
-%  \acro{API}[API]{application program interface}
-%  \acro{AVX}[AVX]{advanced vector extensions}
-%  
-%  \acro{BEC}[BEC]{binary erasure channel}
-%  \acro{BER}[BER]{bit error rate}
-%  \acro{BDMC}[BDMC]{binary \acs{DMC}}
-%  \acro{BP}[BP]{belief propagation}
-%  \acro{BSC}[BSC]{binary symmetric channel}
-%  
-%  \acro{CEL}[CEL]{Communications Engineering Lab}
-%  \acro{CPU}[CPU]{central processing unit}
 %
-%  \acro{DFT}[DFT]{discrete Fourier transform}
-%  \acro{DMC}[DMC]{discrete nemoryless channel}
-%  \acro{dSNR}[dSNR]{design \ac{SNR}}
-%  \acro{DSP}[DSP]{digital signal processing}
-% 
-%  \acro{ESA}[ESA]{European Space Agency}
+% B
 %
-%  \acro{FER}[FER]{frame error rate}
-%  \acro{FFT}[FFT]{fast Fourier transform}
-%  
-%  \acro{GPP}[GPP]{general purpose processor}
-%  \acro{GRC}[GRC]{GNU Radio Companion}
-%  
-%  \acro{NASA}[NASA]{National Aeronautics and Space Administration}
-%  \acro{LDPC}[LDPC]{low-density parity-check}
-%  \acro{SIMD}[SIMD]{single instruction multiple data}
-%  \acro{VOLK}[VOLK]{vector-optimized library of kernels}
+
+\DeclareAcronym{BER}{
+    short = BER,
+    long  = bit error rate
+}
+
+\DeclareAcronym{BP}{
+    short = BP,
+    long  = belief propagation
+}
+
+\DeclareAcronym{BPSK}{
+    short = BPSK,
+    long  = binary phase-shift keying
+}
+
 %
-%  \acro{IDFT}[IDFT]{inverse discrete Fourier transform}
-%  \acro{KIT}[KIT]{Karlsruhe Institute of Technology}
+% F
 %
-%  \acro{LR}[LR]{likelihood ratio}
-%  \acro{LLR}[LLR]{log-likelihood ratio}
-%  \acro{LTE}[LTE]{Long Term Evolution}
-% 
-%  \acro{MAP}[MAP]{maximum a posteriori}
-%  \acro{ML}[ML]{maximum likelihood}
-% 
-%  \acro{NRZ}[NRZ]{non return to zero}
-% 
-%  \acro{RV}[RV]{random variable}
-% 
-%  \acro{SC}[SC]{successive cancellation}
-%  \acro{SCL}[SCL]{successive cancellation list}
-%  \acro{SDR}[SDR]{software defined radio}
-%  \acro{SNR}[SNR]{signal-to-noise ratio}
-%  \acro{SPC}[SPC]{single parity check}
-%  \acro{SSE}[SSE]{streaming \ac{SIMD} extensions}
+
+\DeclareAcronym{FER}{
+    short = FER,
+    long  = frame error rate
+}
+
+\DeclareAcronym{LP}{
+    short = LP,
+    long  = linear programming
+}
+
+\DeclareAcronym{LDPC}{
+    short = LDPC,
+    long  = low-density parity-check
+}
+
 %
-% \acro{UML}[UML]{unified modeling language}
-\end{acronym}
+% M
+%
+
+\DeclareAcronym{MAP}{
+    short = MAP,
+    long  = maximum a posteriori
+}
+
+\DeclareAcronym{ML}{
+    short = ML,
+    long  = maximum likelihood
+}
+
+%
+% P
+%
+
+\DeclareAcronym{PDF}{
+    short = PDF,
+    long  = probability density function
+}
diff --git a/latex/thesis/chapters/theoretical_background.tex b/latex/thesis/chapters/theoretical_background.tex
index 1cbab71..54cec97 100644
--- a/latex/thesis/chapters/theoretical_background.tex
+++ b/latex/thesis/chapters/theoretical_background.tex
@@ -7,8 +7,8 @@
 \label{sec:theo:Preliminaries: Channel Model and Modulation}
 
 \begin{itemize}
-    \item \ac{AWGN}
-    \item \ac{BPSK}
+    \item \Ac{AWGN}
+    \item \Ac{BPSK}
 \end{itemize}
 
 
@@ -68,7 +68,7 @@
 \begin{itemize}
     \item Introduction
     \item Binary linear codes
-    \item LDPC codes
+    \item \Ac{LDPC} codes
 \end{itemize}
 
 
@@ -78,7 +78,7 @@
 
 \begin{itemize}
     \item Introduction to message passing
-    \item Overview of BP altorithm
+    \item Overview of \ac{BP} algorithm
 \end{itemize}
 
 
@@ -87,7 +87,7 @@
 \label{sec:theo:Optimization Methods}
 
 \begin{itemize}
-    \item ADMM
+    \item \Ac{ADMM}
     \item Proximal gradient method
 \end{itemize}
 
diff --git a/latex/thesis/thesis.tex b/latex/thesis/thesis.tex
index 8d52628..13fcae2 100644
--- a/latex/thesis/thesis.tex
+++ b/latex/thesis/thesis.tex
@@ -46,7 +46,7 @@
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage[english]{babel}
-\usepackage[normalem]{ulem}  % wthout 'normalem' this breaks the bibliography
+\usepackage[normalem]{ulem}  % Without 'normalem' this breaks the bibliography
 \usepackage{amsmath}
 \usepackage{amssymb, amsfonts, latexsym}
 \usepackage{float}
@@ -54,9 +54,21 @@
 \usepackage{graphicx}
 \usepackage{subcaption}
 \usepackage{bm}
-\usepackage{todonotes}
 \usepackage{ifthen}
-\usepackage[printonlyused]{acronym}
+
+\usepackage{todonotes}
+% Make tikz ignore '\todo' in the externalization process
+\makeatletter
+\renewcommand{\todo}[2][]{\tikzexternaldisable\@todo[#1]{#2}\tikzexternalenable}
+\makeatother
+
+\usepackage{acro}
+\usepackage{mfirstuc}
+\acsetup{  % Capitalize the first character of every word
+  uppercase/list,
+  make-links,
+  format/first-long=\itshape,
+}
 
 \usepackage{caption}
 \DeclareCaptionLabelFormat{bf-nodot}{\textbf{#1}~\textbf{#2}}
@@ -78,6 +90,8 @@
 % Document %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\input{abbreviations.tex}
+
 
 \begin{document}
 
@@ -185,7 +199,8 @@
     \appendix
     %\listoffigures
     %\listoftables
-    \include{abbreviations}
+    %\include{abbreviations}
+    \printacronyms
     \printbibliography[heading=bibintoc]
 
 \end{document}