-\newcommand{\todo}[1]{\textcolor{red}{\index{Todo}\LARGE TODO:~#1}}
-\newcommand{\definition}[1]{\textit{#1}\index{#1}} % FIXME: add to glossary?
-\newcommand{\cmd}[1]{\texttt{#1}\index{#1}} % FIXME: add to glossary?
-\newcommand{\magicnumber}[1]{\texttt{#1}}
+% \newcommand{\todo}[1]{\textcolor{red}{\index{Todo}\LARGE TODO:~#1}}
+\newcommand{\deffont}[1]{\textit{#1}}
+\newcommand{\definition}[1]{\deffont{#1}\index{#1}}
+\newcommand{\cmd}[1]{\texttt{#1}\index{#1 (command)}}
+\newcommand{\progfont}[1]{\textsf{#1}}
+\newcommand{\prog}[1]{\progfont{#1}\index{#1 (program)}}
+\newcommand{\code}[1]{\texttt{#1}}
+\newcommand{\fnfont}[1]{\textsf{#1}}
+\newcommand{\classfont}[1]{\textsf{#1}}
+\newcommand{\class}[1]{\classfont{#1}\index{#1 (class)}}
+\newcommand{\conceptfont}[1]{\textsf{#1}}
+\newcommand{\concept}[1]{\conceptfont{#1}\index{#1 (concept)}}
+\newcommand{\filefont}[1]{\textsf{#1}}
+\newcommand{\file}[1]{\filefont{#1}\index{#1 (file)}}
+\newcommand{\filepath}[1]{\filefont{#1}}
+\newcommand{\magicvalue}[1]{\code{#1}}
+\newcommand{\opcode}[1]{\ac{opcode} \magicvalue{#1}}