%Table of contents
\tableofcontents
-\addcontentsline{toc}{chapter}{Glossaries \& Acronyms}
-\printglossaries%
-
\mainmatter{}
\glsresetall{}
\chapter{Introduction}\label{chp:introduction}
\chapter[The mTask-EDSL]{The \gls{mTask}-\gls{EDSL}}\label{chp:mtask}
\input{mtask}
-\chapter[Extending the mTask EDSL]{Extending the \gls{mTask} {EDSL}}\label{chp:mtaskcont}
+\chapter[System Overview]{System Overview}\label{chp:system}
+\input{system}
+
+\chapter[Extending the mTask EDSL]%
+ {Extending the \gls{mTask} {EDSL}}\label{chp:mtaskcont}
\input{mtaskext}
-\chapter{System Architecture}\label{chp:arch}
+\chapter{System Considerations and Implementation}\label{chp:arch}
\input{arch}
\chapter{Discussion \& Conclusion}\label{chp:conclusion}
\appendix\label{chp:appendix}
-\chapter{Communication protocol}\label{app:communication-protocol}
+\chapter{Communication Protocol}\label{app:communication-protocol}
\input{appendix-protocol}
-\chapter{Device client interface}\label{app:device-interface}
+\chapter{Device Client Interface}\label{app:device-interface}
\input{appendix-device-interface}
-\cleardoublepage{}
\phantomsection{}
\addcontentsline{toc}{chapter}{Bibliography}
\bibliographystyle{ieeetr}
\bibliography{thesis}
+\addcontentsline{toc}{chapter}{Glossary}
+\printglossaries%
+
\cleardoublepage{}
\phantomsection{}
\addcontentsline{toc}{chapter}{Lists of \ldots}