diff --git a/doc/environments/groupthm/groupthm.dtx b/doc/environments/groupthm/groupthm.dtx
index 1593ede..dc8f6ae 100644
--- a/doc/environments/groupthm/groupthm.dtx
+++ b/doc/environments/groupthm/groupthm.dtx
@@ -44,16 +44,18 @@
 % {%
 %  \emph{#1}%
 % }
-% \NewDocumentCommand{\ma}{m}
-% {
-%   \{\meta{#1}\}
-% }
 % 
 % \begin{documentation}
 % 
 % \tableofcontents
+% \listoftodos
 % \newpage
-%   
+% 
+% \begin{itemize}
+%   \item Inheritance
+%   \item Appending to groups
+%   \item Generation + parsing of families
+% \end{itemize}
 % A central thing in \LaTeX is the usage of \enquote{theorems}.
 % With \enquote{theorems} we actually mean \enquote{environments} that typically
 % have a title, some style applied to their contents and are numbered throughout 
@@ -230,7 +232,7 @@
 % 
 % \begin{function}{\NewTheoremGroup, \RenewTheoremGroup, \ProvideTheoremGroup, \DeclareTheoremGroup}
 %   \begin{syntax}
-%     \cs{NewTheoremGroup}[\meta{keys}]\{\meta{theorem group}\}
+%     \cs{NewTheoremGroup}\oarg{keys}\marg{theorem group}
 %   \end{syntax}
 %   
 %   This introduces a new \meta{theorem group} with the given name.
@@ -273,8 +275,8 @@
 % 
 % \begin{function}{\DeclareTheoremGroupRule}
 %     \begin{syntax}
-% \cs{DeclareTheoremGroupRule}[\meta{keyname}]%
-% \{\meta{theorem group 1}\}\{\meta{relation}\}\{\meta{theorem group 2}\}
+% \cs{DeclareTheoremGroupRule}\oarg{keyname}%
+% \marg{theorem group 1}\marg{relation}\marg{theorem group 2}
 %     \end{syntax}
 %   
 %   This declares some relation between the two theorem groups,
@@ -328,7 +330,7 @@
 % \subsection{Inheritance of theorem groups}
 % \begin{function}{\AddTheoremGroupParent}
 %   \begin{syntax}
-%     \cs{AddTheoremGroupParent}\{\meta{theorem group 1}\}\{\meta{theorem group 2}\}
+%     \cs{AddTheoremGroupParent}\marg{theorem group 1}\marg{theorem group 2}
 %   \end{syntax}
 %   Declares \meta{theorem group 1} to \enquote{inherit} all properties
 %   of \meta{theorem group 2}.
@@ -351,7 +353,7 @@
 % \subsection{Appending to theorem groups}
 % \begin{function}{\AppendToTheoremGroup}
 %   \begin{syntax}
-%     \cs{AppendToTheoremGroup}[\meta{keys}]\{\meta{theorem group}\}
+%     \cs{AppendToTheoremGroup}\oarg{keys}\marg{theorem group}
 %   \end{syntax}
 %   Adds the properties given as \meta{keys} to the theorem group.
 %   The syntax for the \meta{keys} is the same as in \cs{NewTheoremGroup}.
@@ -432,7 +434,7 @@
 % 
 % \begin{function}{\NewGroupedTheorem, \ProvideGroupedTheorem}
 %   \begin{syntax}
-%     \cs{NewGroupedTheorem}[\meta{keys}]\{\meta{theorem name}\}
+%     \cs{NewGroupedTheorem}\oarg{keys}\marg{theorem name}
 %   \end{syntax}
 %   This defines \meta{theorem name}  as a new theorem environment.
 %   Its properties can be set by the following keys:
@@ -448,7 +450,7 @@
 % 
 %     \item
 % 
-%       \kw{group} $=$ \{\meta{clist}\}
+%       \kw{group} $=$ \marg{clist}
 % 
 %       Makes this theorem a member of the listed groups.
 %       It will inherit all respective properties of these groups.
@@ -457,7 +459,7 @@
 % 
 %     \item
 % 
-%       \kw{thmtools} = \{\meta{clist}\}
+%       \kw{thmtools} = \marg{clist}
 % 
 %       Passes these option to the \pkg{thmtools} environment that is declared internally.
 %     
@@ -466,7 +468,7 @@
 % 
 % \begin{function}{\NewGroupedTheorem*,\ProvideGroupedTheorem*}
 %   \begin{syntax}
-%     \cs{NewGroupedTheorem*}[\meta{keys}]\{\meta{theorem name}\}
+%     \cs{NewGroupedTheorem*}\oarg{keys}\marg{theorem name}
 %   \end{syntax}
 %   Behaves the same as \cs{NewGroupedTheorem},
 %   but also adds the theorem to the default \kw{unnumbered} group,
@@ -478,7 +480,7 @@
 % 
 % \begin{function}{\NewTheorem, \ProvideTheorem}
 %   \begin{syntax}
-%     \cs{NewTheorem}[\meta{keys}]\{\meta{theorem name}\}
+%     \cs{NewTheorem}\oarg{keys}\marg{theorem name}
 %   \end{syntax}
 % 
 %   This behaves essentially the same as \cs{NewGroupedTheorem},
@@ -493,7 +495,7 @@
 % 
 % \begin{function}{\NewTheorem*, \ProvideTheorem*}
 %   \begin{syntax}
-%     \cs{NewTheorem}[\meta{keys}]\{\meta{theorem name}\}
+%     \cs{NewTheorem}\oarg{keys}\marg{theorem name}
 %   \end{syntax}
 %   Combines the behavior of \cs{NewGroupedTheorem*} and \cs{NewTheorem}, thus
 %   declaring \meta{theorem} to (additionally) be member of the \kw{unnumbered}
@@ -506,7 +508,7 @@
 % 
 % \begin{function}{\NewGroupedTheoremFamily, \ProvideGroupedTheoremFamily}
 %   \begin{syntax}
-%     \cs{NewTheoremFamily}[\meta{keys}]\{\meta{theorem name}\}
+%     \cs{NewTheoremFamily}\oarg{keys}\marg{theorem name}
 %   \end{syntax}
 % 
 %   Defines a family of grouped theorems.
@@ -550,7 +552,7 @@
 % 
 % \begin{function}{\AddTheoremToGroup}
 %   \begin{syntax}
-%     \cs{AddTheoremToGroup}\{\meta{theorem group}\}
+%     \cs{AddTheoremToGroup}\marg{theorem group}
 %   \end{syntax}
 %   
 %   Means that the current invocation of a theorem family should
@@ -565,8 +567,8 @@
 %   \ProvideGroupedTheoremFamilyOptions, \DeclareGroupedTheoremFamilyOptions
 % }
 % \begin{syntax}
-%   \cs{NewGroupedTheoremFamilyOptions}\{\meta{theorem name}\}\{\meta{argument specifiation}\}%
-%   \{\meta{selection body}\}
+%   \cs{NewGroupedTheoremFamilyOptions}\marg{theorem name}\marg{argument specifiation}%
+%   \marg{selection body}
 % \end{syntax}
 % 
 % Defines a new environment with options, given by \meta{theorem name}.
@@ -600,8 +602,8 @@
 %     \ProvideGroupedTheoremFamilyOptions*, \DeclareGroupedTheoremFamilyOptions*
 %   }
 %   \begin{syntax}
-%   \cs{NewGroupedTheoremFamilyOptions*}\{\meta{theorem name}\}\{\meta{argument specifiation}\}%
-%   \{\meta{selection body}\}
+%   \cs{NewGroupedTheoremFamilyOptions*}\marg{theorem name}\marg{argument specifiation}%
+%   \marg{selection body}
 %   \end{syntax}
 %   
 %   Does the same as \cs{NewGroupedTheoremFamilyOptions},
@@ -618,8 +620,8 @@
 %     \ProvideTheoremFamilyOptions, \DeclareTheoremFamilyOptions
 %   }
 %   \begin{syntax}
-%     \cs{NewTheoremFamilyOptions}\{\meta{theorem name}\}\{\meta{argument specifiation}\}%
-%     \{\meta{selection body}\}
+%     \cs{NewTheoremFamilyOptions}\marg{theorem name}\marg{argument specifiation}%
+%     \marg{selection body}
 %   \end{syntax}
 % 
 %   This behaves essentially the same as \cs{NewGroupedTheoremFamilyOptions},
@@ -638,8 +640,8 @@
 %     \ProvideTheoremFamilyOptions*, \DeclareTheoremFamilyOptions*
 %   }
 %   \begin{syntax}
-%     \cs{NewTheoremFamilyOptions*}\{\meta{theorem name}\}\{\meta{argument specifiation}\}%
-%     \{\meta{selection body}\}
+%     \cs{NewTheoremFamilyOptions*}\marg{theorem name}\marg{argument specifiation}%
+%     \marg{selection body}
 %   \end{syntax}
 % 
 %   Combines the behavior of \cs{NewGroupedTheoremFamilyOptions*} and \cs{NewTheoremFamilyOptions},
@@ -682,10 +684,10 @@
 %     where the \meta{mandatory args} list the mandatory args of the \LaTeX2e
 %     interface, and the \meta{optional args} list the optional args
 %     of the key-value interface, but requiring them mandatory as well.
-%   \item \cs{groupthm_new_foo_from_keys:mmm}\{\meta{keys}\}\meta{mandatory args}
+%   \item \cs{groupthm_new_foo_from_keys:mmm}\marg{keys}\meta{mandatory args}
 %     where we pass a \texttt{clist} as the first argument and all mandatory args
 %     as further mandatory arguments.
-%   \item \cs{NewFoo}[\meta{keys}]\meta{mandatory args},
+%   \item \cs{NewFoo}\oarg{keys}\meta{mandatory args},
 %     where the keys can be passed optionally.
 % \end{itemize}
 % 
@@ -700,7 +702,7 @@
 %   \groupthm_declare_theorem_group_from_keys:nn
 % }
 %   \begin{syntax}
-%     \cs{groupthm_new_theorem_group_from_keys:nn}\ma{keys}\ma{theorem group}
+%     \cs{groupthm_new_theorem_group_from_keys:nn}\marg{keys}\marg{theorem group}
 %   \end{syntax}
 %
 %    \LaTeX3 versions of \cs{NewTheoremGroup}, \cs{RenewTheoremGroup},
@@ -722,8 +724,8 @@
 %   \groupthm_declare_theorem_group:nVVVV
 % }
 %   \begin{syntax}
-%     \cs{groupthm_new_theorem_group:nnnnn}\ma{theorem group}\ma{prename tl}
-%     \ma{postname tl}\ma{mapname clist}\ma{thmtools clist}
+%     \cs{groupthm_new_theorem_group:nnnnn}\marg{theorem group}\marg{prename tl}
+%     \marg{postname tl}\marg{mapname clist}\marg{thmtools clist}
 %   \end{syntax}
 %  
 % Non-keyval versions of
@@ -741,8 +743,8 @@
 %
 % \begin{function}{\groupthm_declare_theorem_group_rule:nnnn}
 %    \begin{syntax}
-%       \cs{groupthm_declare_theorem_group_rule:nnnn}\ma{keyname}\ma{theorem group 1}
-%       \ma{relation}\ma{theorem group 2}
+%       \cs{groupthm_declare_theorem_group_rule:nnnn}\marg{keyname}\marg{theorem group 1}
+%       \marg{relation}\marg{theorem group 2}
 %    \end{syntax}
 %
 %  \LaTeX3 version of \cs{DeclareTheoremGroupRule}
@@ -754,7 +756,7 @@
 %
 % \begin{function}{\groupthm_new_grouped_theorem_from_keys:nn, \groupthm_provide_grouped_theorem_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_provide_grouped_theorem_from_keys:nn}\ma{keys}\ma{environment name}
+%       \cs{groupthm_provide_grouped_theorem_from_keys:nn}\marg{keys}\marg{environment name}
 %    \end{syntax}
 %   
 %   \LaTeX3 version of \cs{NewGroupedTheorem}, \cs{ProvideGroupedTheorem}
@@ -768,7 +770,7 @@
 %   \groupthm_provide_grouped_theorem_star_from_keys:nn
 % }
 %    \begin{syntax}
-%       \cs{groupthm_new_grouped_theorem_star_from_keys:nn}\ma{keys}\ma{environment name}
+%       \cs{groupthm_new_grouped_theorem_star_from_keys:nn}\marg{keys}\marg{environment name}
 %    \end{syntax}
 %
 % 
@@ -781,7 +783,7 @@
 %
 % \begin{function}{\groupthm_new_theorem_from_keys:nn, \groupthm_provide_theorem_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_provide_theorem_from_keys:nn}\ma{keys}\ma{environment name}
+%       \cs{groupthm_provide_theorem_from_keys:nn}\marg{keys}\marg{environment name}
 %    \end{syntax}
 %   
 %   \LaTeX3 version of \cs{NewTheorem}, \cs{ProvideTheorem}
@@ -791,7 +793,7 @@
 %
 % \begin{function}{\groupthm_new_theorem_star_from_keys:nn, \groupthm_provide_theorem_star_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_new_theorem_star_from_keys:nn}\ma{keys}\ma{environment name}
+%       \cs{groupthm_new_theorem_star_from_keys:nn}\marg{keys}\marg{environment name}
 %    \end{syntax}
 %
 %   \LaTeX3 version of \cs{NewTheorem*}, \cs{ProvideTheorem*}
@@ -811,7 +813,7 @@
 %   \groupthm_provide_theorem_star:nnnn
 % }
 %    \begin{syntax}
-%       \cs{groupthm_new_theorem:nnnn}\ma{keys}\ma{environment name}
+%       \cs{groupthm_new_theorem:nnnn}\marg{keys}\marg{environment name}
 %    \end{syntax}
 % 
 %   Non-keyval versions of above macros.
@@ -867,7 +869,7 @@
 % hook role setting mechanism:
 % \begin{macro}{\@@_hook_gset_rule_foreach:nNnn}
 %    \begin{syntax}
-%       \cs{@@_hook_gset_rule_foreach:nNnn}\ma{hook}\meta{clist name}\meta{relation}\meta{label}
+%       \cs{@@_hook_gset_rule_foreach:nNnn}\marg{hook}\meta{clist name}\meta{relation}\meta{label}
 %    \end{syntax}
 %		 
 %   This is a wrapper around the \cs{hook_gset_rule:nnnn} macro
@@ -893,7 +895,7 @@
 %
 % When an unknown group is used somwhere:
 %    \begin{syntax}
-%      \cs{msg_error:nnn}\{ groupthm \}\{ unknown group \}\{\meta{groupname}\}
+%      \cs{msg_error:nnn}\{ groupthm \}\{ unknown group \}\marg{groupname}
 %    \end{syntax}
 %    \begin{macrocode}
 \msg_new:nnn { groupthm } { unknown ~ group }
@@ -904,7 +906,7 @@
 %
 % When an unknown key has been used:
 % \begin{syntax}
-%   \cs{msg_error:nnn}\{ groupthm \}\{ unknown key \}\{\meta{key}\}
+%   \cs{msg_error:nnn}\{ groupthm \}\{ unknown key \}\marg{key}
 % \end{syntax}
 %    \begin{macrocode}
 \msg_new:nnn { groupthm } { unknown ~ key }
@@ -916,7 +918,7 @@
 % Some data structure is already defined or not defined yet.
 % \begin{syntax}
 %   \cs{msg_error:nnnnn}\{ groupthm \}\{ wrong definition \}
-%   \{\meta{type}\}\{\meta{name}\}\{\meta{already $\|$ not}\}
+%   \marg{type}\marg{name}\marg{already $\|$ not}
 % \end{syntax}
 %    \begin{macrocode}
 \msg_new:nnn { groupthm } { wrong ~ definition }
@@ -945,7 +947,7 @@
 %
 % \begin{macro}{\hook_gset_rule:nnVn}
 %    \begin{syntax}
-%       \cs{hook_gset_rule:nnVn}\{\meta{hook}\}\{\meta{label 1}\}\{\meta{relation}\}\{\meta{label 2}\}
+%       \cs{hook_gset_rule:nnVn}\marg{hook}\marg{label 1}\marg{relation}\marg{label 2}
 %    \end{syntax}
 %
 %		 Just a variant of the usual \cs{hook_gset_rule:nnnn} macro that we use.
@@ -1056,7 +1058,7 @@
 %
 % \begin{macro}{\@@_set_normalized_keys:nnn}
 %    \begin{syntax}
-%       \cs{@@_set_normalized_keys:nnn}\ma{keys}\ma{key group}\ma{fallback name}
+%       \cs{@@_set_normalized_keys:nnn}\marg{keys}\marg{key group}\marg{fallback name}
 %    \end{syntax}
 %		 
 % Sets the packages keys and normalizes the retrieved values, that is,
@@ -1124,7 +1126,7 @@
 %
 % \begin{macro}{\@@_add_to_theorem_group_ordering:n}
 %    \begin{syntax}
-%       \cs{@@_add_to_theorem_group_ordering:n}\ma{theorem group}
+%       \cs{@@_add_to_theorem_group_ordering:n}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    Sets hook relations for this group and all already defined theorem groups.     
@@ -1145,7 +1147,7 @@
 % 
 % \begin{macro}{\@@_remove_from_theorem_group_ordering:n}
 %    \begin{syntax}
-%       \cs{@@_remove_from_theorem_group_ordering:n}\ma{theorem group}
+%       \cs{@@_remove_from_theorem_group_ordering:n}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    Removes all relations of this theorem group with the currently defined theorem groups.
@@ -1166,7 +1168,7 @@
 %
 % \begin{macro}{\@@_add_to_sort_hook:n}
 %    \begin{syntax}
-%       \cs{@@_add_to_sort_hook:n}\ma{theorem group}
+%       \cs{@@_add_to_sort_hook:n}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    Adds the theorem group into the sort hook to be restored later from it.
@@ -1208,8 +1210,8 @@
 % 
 % \begin{macro}{\@@_declare_theorem_group_aux:nnnnn}
 %    \begin{syntax}
-%       \cs{@@_declare_theorem_group_aux:nnnnn}\{\meta{theorem group}\}\{\meta{prename tl}\}
-%       \{\meta{postname tl}\}\{\meta{mapname clist}\}\{\meta{thmtools clist}\}
+%       \cs{@@_declare_theorem_group_aux:nnnnn}\marg{theorem group}\marg{prename tl}
+%       \marg{postname tl}\marg{mapname clist}\marg{thmtools clist}
 %    \end{syntax}
 %		 
 % This creates a new theorem group out of the given parameters.
@@ -1270,7 +1272,7 @@
 % 
 % \begin{macro}{\@@_undeclare_theorem_group_aux:n}
 %    \begin{syntax}
-%       \cs{@@_undeclare_theorem_group_aux:n}\ma{theorem group}
+%       \cs{@@_undeclare_theorem_group_aux:n}\marg{theorem group}
 %    \end{syntax}
 %		 
 % Undeclares / undefines the given theorem group.
@@ -1443,7 +1445,7 @@
 %
 % \begin{macro}{\groupthm_new_theorem_group_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_new_theorem_group_from_keys:nn}\ma{keys}\ma{theorem group}
+%       \cs{groupthm_new_theorem_group_from_keys:nn}\marg{keys}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1463,7 +1465,7 @@
 %
 % \begin{macro}{\groupthm_renew_theorem_group_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_renew_theorem_group_from_keys:nn}\ma{keys}\ma{theorem group}
+%       \cs{groupthm_renew_theorem_group_from_keys:nn}\marg{keys}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1483,7 +1485,7 @@
 %
 % \begin{macro}{\groupthm_provide_theorem_group_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_provide_theorem_group_from_keys:nn}\ma{keys}\ma{theorem group}
+%       \cs{groupthm_provide_theorem_group_from_keys:nn}\marg{keys}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1503,7 +1505,7 @@
 %
 % \begin{macro}{\groupthm_declare_theorem_group_from_keys:nn}
 %    \begin{syntax}
-%       \cs{groupthm_declare_theorem_group_from_keys:nn}\ma{keys}\ma{theorem group}
+%       \cs{groupthm_declare_theorem_group_from_keys:nn}\marg{keys}\marg{theorem group}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1574,8 +1576,8 @@
 %
 % \begin{macro}{\groupthm_declare_theorem_group_rule:nnnn}
 %    \begin{syntax}
-%       \cs{groupthm_declare_theorem_group_rule:nnnn}\ma{keyname}\ma{theorem group 1}
-%       \ma{relation}\ma{theorem group 2}
+%       \cs{groupthm_declare_theorem_group_rule:nnnn}\marg{keyname}\marg{theorem group 1}
+%       \marg{relation}\marg{theorem group 2}
 %    \end{syntax}
 %		 
 % We have to normalize the arguments a little bit, namely replacing \texttt{higher}
@@ -1611,8 +1613,8 @@
 
 % \begin{macro}{\DeclareTheoremGroupRule}
 %    \begin{syntax}
-%      \cs{DeclareTheoremGroupRule}[\meta{keyname}]%
-%      \{\meta{theorem group 1}\}\{\meta{relation}\}\{\meta{theorem group 2}\}
+%      \cs{DeclareTheoremGroupRule}\oarg{keyname}%
+%      \marg{theorem group 1}\marg{relation}\marg{theorem group 2}
 %    \end{syntax}
 %
 %    \begin{macrocode}
@@ -1632,7 +1634,7 @@
 %
 % \begin{macro}{\@@_powerset_clist_foreach:Nn}
 %    \begin{syntax}
-%       \cs{@@_powerset_clist_foreach:Nn}\meta{clist}\ma{code}
+%       \cs{@@_powerset_clist_foreach:Nn}\meta{clist}\marg{code}
 %    \end{syntax}
 %		 
 %   Executes \meta{code} for each subset of the given clist variable.
@@ -1730,8 +1732,8 @@
 %
 % \begin{macro}{\@@_declare_grouped_theorem_aux:nnnn}
 %    \begin{syntax}
-%       \cs{@@_declare_grouped_theorem_aux:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{@@_declare_grouped_theorem_aux:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %   This is the internal backend that declares a grouped theorem
@@ -1807,8 +1809,8 @@
 %
 % \begin{macro}{\groupthm_new_grouped_theorem:nnnn,\groupthm_new_grouped_theorem:nVVV}
 %    \begin{syntax}
-%       \cs{groupthm_new_grouped_theorem:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_new_grouped_theorem:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1874,8 +1876,8 @@
 % 
 % \begin{macro}{\groupthm_provide_grouped_theorem_star:nnnn}
 %    \begin{syntax}
-%       \cs{groupthm_provide_grouped_theorem_star:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_provide_grouped_theorem_star:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1896,8 +1898,8 @@
 % 
 % \begin{macro}{\groupthm_new_theorem:nnnn,\groupthm_new_theorem:nVVV}
 %    \begin{syntax}
-%       \cs{groupthm_new_theorem:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_new_theorem:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %
@@ -1917,8 +1919,8 @@
 % 
 % \begin{macro}{\groupthm_provide_theorem:nnnn,\groupthm_provide_theorem:nVVV}
 %    \begin{syntax}
-%       \cs{groupthm_provide_theorem:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_provide_theorem:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %
@@ -1942,8 +1944,8 @@
 % 
 % \begin{macro}{\groupthm_new_theorem_star:nnnn}
 %    \begin{syntax}
-%       \cs{groupthm_new_theorem_star:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_new_theorem_star:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -1959,8 +1961,8 @@
 % 
 % \begin{macro}{\groupthm_provide_theorem_star:nnnn}
 %    \begin{syntax}
-%       \cs{groupthm_provide_theorem_star:nnnn}\ma{environment name}
-%       \ma{groups clist}\ma{theorem name}\ma{thmtools keys}
+%       \cs{groupthm_provide_theorem_star:nnnn}\marg{environment name}
+%       \marg{groups clist}\marg{theorem name}\marg{thmtools keys}
 %    \end{syntax}
 %		 
 %    \begin{macrocode}
@@ -2113,7 +2115,7 @@
 %
 % \begin{macro}{\NewGroupedTheorem}
 %    \begin{syntax}
-%       \cs{NewGroupedTheorem}[\meta{keys}]\ma{theorem name}
+%       \cs{NewGroupedTheorem}\oarg{keys}\marg{theorem name}
 %    \end{syntax}
 %
 %    \begin{macrocode}
@@ -2133,7 +2135,7 @@
 % 
 % \begin{macro}{\ProvideGroupedTheorem}
 %    \begin{syntax}
-%       \cs{ProvideGroupedTheorem}[\meta{keys}]\ma{theorem name}
+%       \cs{ProvideGroupedTheorem}\oarg{keys}\marg{theorem name}
 %    \end{syntax}
 %
 %    \begin{macrocode}
@@ -2154,7 +2156,7 @@
 % 
 % \begin{macro}{\NewTheorem}
 %    \begin{syntax}
-%       \cs{NewTheorem}[\meta{keys}]\ma{theorem name}
+%       \cs{NewTheorem}\oarg{keys}\marg{theorem name}
 %    \end{syntax}
 %
 %    \begin{macrocode}
@@ -2174,7 +2176,7 @@
 % 
 % \begin{macro}{\ProvideTheorem}
 %    \begin{syntax}
-%       \cs{ProvideTheorem}[\meta{keys}]\ma{theorem name}
+%       \cs{ProvideTheorem}\oarg{keys}\marg{theorem name}
 %    \end{syntax}
 %
 %    \begin{macrocode}
@@ -2201,4 +2203,3 @@
 %   \end{implementation}
 % \end{documentation}
 % \newpage
-% \PrintIndex
diff --git a/doc/environments/groupthm/groupthm.tdo b/doc/environments/groupthm/groupthm.tdo
new file mode 100644
index 0000000..5a45953
--- /dev/null
+++ b/doc/environments/groupthm/groupthm.tdo
@@ -0,0 +1,8 @@
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ insert code example output}{4}{section*.3}%
+\contentsline {todo}{\color@fb@x {}{black}{}{orange}{\leavevmode {\color {orange}o}}\ code}{4}{section*.4}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{7}{section*.5}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{7}{section*.6}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{8}{section*.7}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{9}{section*.8}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{10}{section*.9}%
+\contentsline {todo}{\color@fb@x {}{black}{}{red!40}{\leavevmode {\color {red!40}o}}\ Add reference.}{17}{section*.10}%