diff --git a/format/WZLTemplate_files/SET_TablesOfThings.tex b/format/WZLTemplate_files/SET_TablesOfThings.tex
index b2d874e5acf46ae8a906f251f0d5ec6f148e7e89..1518ba2bdc86c0236e32a05cbe52f0e9747d7272 100644
--- a/format/WZLTemplate_files/SET_TablesOfThings.tex
+++ b/format/WZLTemplate_files/SET_TablesOfThings.tex
@@ -32,3 +32,87 @@
 	\renewcommand{\thechapter}{\arabic{chapter}}
 	
 }
+
+
+%% TOC - Table of Contents
+\newcommand{\toc}{
+	\let\tmpcontentsname\contentsname
+	\renewcommand{\contentsname}{\Roman{romancounter}\hspace{1.5em}\tmpcontentsname}
+	\cleardoublepage
+    \phantomsection
+    \addcontentsline{toc}{chapter}{\contentsname}
+	\renewcommand{\cftchapdotsep}{\cftdotsep}
+	\tableofcontents
+	% \stepcounter{romancounter}
+	\stepcounter{chapter}
+}
+
+
+%% List of figures
+\newcommand{\lof}{
+    %% List of figures
+    \stepcounter{romancounter}
+    \let\tmplistfigurename\listfigurename
+    \renewcommand{\listfigurename}{\Roman{romancounter}\hspace{1em}\tmplistfigurename}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listfigurename}
+    \listoffigures
+}
+
+
+%% List of tables
+\newcommand{\lot}{
+    \stepcounter{romancounter}
+    \let\tmplisttablename\listtablename
+    \renewcommand{\listtablename}{\Roman{romancounter}\hspace{1em}\tmplisttablename}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listtablename}
+    \listoftables
+}
+
+
+
+
+%% List of Symbols
+\newcommand{\los}{
+    \stepcounter{romancounter}
+    \newcommand{\listsymbolname}{\Roman{romancounter}\hspace{1em}\tmpsymbolname}
+    \label{ch:symbols}
+    \cleardoublepage\phantomsection
+    \thispagestyle{plain}
+    \par\nobreak
+    \printglossary[
+        title=\listsymbolname,
+        type=symbols,
+        style=symbols_style,
+    ]
+}
+
+
+%% List of Glossary
+\newcommand{\glossarylist}{
+    \stepcounter{romancounter}
+    \newcommand{\theglossaryname}{\Roman{romancounter}\hspace{1em}\tmpglossaryname}
+    \label{ch:glossary}
+    \cleardoublepage\phantomsection
+    \thispagestyle{plain}
+    \par\nobreak
+    \printglossary[
+        title=\theglossaryname,
+        type=main,
+        style=glossary_style,
+    ]
+    \newpage
+}
+
+
+%% List of acronyms
+\newcommand{\loa}{
+    \stepcounter{romancounter}
+    \newcommand{\listacronymname}{\Roman{romancounter}\hspace{1em}\tmpacronymname}
+    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listacronymname}
+    \label{ch:acronyms}
+    \thispagestyle{plain}
+    {\cftlottitlefont\listacronymname}{\cftafterlottitle}
+    \par\nobreak
+    \input{format/acronyms}
+    \newpage
+}
diff --git a/format/functions.tex b/format/functions.tex
index 26b7ee1c4b1a65150dffc39d3ce52afaf0733df0..d2583ea143d99b190f2f2a5fef9a2355c4bdd2e0 100644
--- a/format/functions.tex
+++ b/format/functions.tex
@@ -13,89 +13,6 @@
 }
 
 
-%% TOC - Table of Contents
-\newcommand{\toc}{
-	\let\tmpcontentsname\contentsname
-	\renewcommand{\contentsname}{\Roman{romancounter}\hspace{1.5em}\tmpcontentsname}
-	\cleardoublepage
-    \phantomsection
-    \addcontentsline{toc}{chapter}{\contentsname}
-	\renewcommand{\cftchapdotsep}{\cftdotsep}
-	\tableofcontents
-	% \stepcounter{romancounter}
-	\stepcounter{chapter}
-}
-
-
-%% List of figures
-\newcommand{\lof}{
-    %% List of figures
-    \stepcounter{romancounter}
-    \let\tmplistfigurename\listfigurename
-    \renewcommand{\listfigurename}{\Roman{romancounter}\hspace{1em}\tmplistfigurename}
-    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listfigurename}
-    \listoffigures
-}
-
-
-%% List of tables
-\newcommand{\lot}{
-    \stepcounter{romancounter}
-    \let\tmplisttablename\listtablename
-    \renewcommand{\listtablename}{\Roman{romancounter}\hspace{1em}\tmplisttablename}
-    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listtablename}
-    \listoftables
-}
-
-
-
-
-%% List of Symbols
-\newcommand{\los}{
-    \stepcounter{romancounter}
-    \newcommand{\listsymbolname}{\Roman{romancounter}\hspace{1em}\tmpsymbolname}
-    \label{ch:symbols}
-    \cleardoublepage\phantomsection
-    \thispagestyle{plain}
-    \par\nobreak
-    \printglossary[
-        title=\listsymbolname,
-        type=symbols,
-        style=symbols_style,
-    ]
-}
-
-
-%% List of Glossary
-\newcommand{\glossarylist}{
-    \stepcounter{romancounter}
-    \newcommand{\theglossaryname}{\Roman{romancounter}\hspace{1em}\tmpglossaryname}
-    \label{ch:glossary}
-    \cleardoublepage\phantomsection
-    \thispagestyle{plain}
-    \par\nobreak
-    \printglossary[
-        title=\theglossaryname,
-        type=main,
-        style=glossary_style,
-    ]
-    \newpage
-}
-
-
-%% List of acronyms
-\newcommand{\loa}{
-    \stepcounter{romancounter}
-    \newcommand{\listacronymname}{\Roman{romancounter}\hspace{1em}\tmpacronymname}
-    \cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{\listacronymname}
-    \label{ch:acronyms}
-    \thispagestyle{plain}
-    {\cftlottitlefont\listacronymname}{\cftafterlottitle}
-    \par\nobreak
-    \input{format/acronyms}
-    \newpage
-}
-
 
 %% Start of main text
 \newcommand{\startmain}