chemmacros (5jan13)

git-svn-id: svn://tug.org/texlive/trunk@28740 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 2875 insertions, 2824 deletions

diff --git a/Master/texmf-dist/doc/latex/chemmacros/README b/Master/texmf-dist/doc/latex/chemmacros/README
index 2616a1258bd..f35f2658692 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/README
+++ b/Master/texmf-dist/doc/latex/chemmacros/README
@@ -1,10 +1,10 @@
 --------------------------------------------------------------------------
-the CHEMMACROS bundle v3.4a
+the CHEMMACROS bundle v3.4b
 -> chemmacros package  -> macros and commands for chemists
 -> chemformula package -> typeset chemical compounds and reactions
 -> ghsystem package    -> typeset H & P statements and pictograms
                           from the globally harmonised system (GHS)
-2012/10/03
+2013/01/04
 --------------------------------------------------------------------------
 This bundle succeeds the chemmacros package which is now part of the
 bundle
@@ -13,7 +13,7 @@ Clemens Niederberger
 Web:    https://bitbucket.org/cgnieder/chemmacros/
 E-Mail: contact@mychemistry.eu
 --------------------------------------------------------------------------
-Copyright 2011-2012 Clemens Niederberger
+Copyright 2011-2013 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex b/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
index 589429f6724..82e0636e67b 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemformula_test_sub_and_superscripts.tex
@@ -36,7 +36,8 @@ Isotop:\\
 \verb|\ch{123^{23}B}| \ch{123^{23}B +}\\
 \verb|\ch{_{123}^{23}B}| \ch{_{123}^{23}B +}\\
 \verb|\ch{23^{123}B}| \ch{23^{123}B +}\\
-\verb|\ch{_{23}^{123}B}| \ch{_{23}^{123}B +}
+\verb|\ch{_{23}^{123}B}| \ch{_{23}^{123}B +} \\
+\verb|\ch{_{23}^{123}B + _{23}^{123}B}| \ch{_{23}^{123}B + _{23}^{123}B}
 
 Formel:\\
 \verb|\ch{B3}| \ch{B3 +}\\
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
index 6839cc88641..33f76488e75 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
index 1ed6dbe6355..e5d245d5261 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_de.tex
@@ -1,7 +1,7 @@
-% arara: xelatex: { shell: true }
+% arara: xelatex
 % arara: biber
 % arara: xelatex
-% arara: xelatex: { shell: true }
+% arara: xelatex
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ----------------------------------------------------------------------------- 
 % - the CHEMMACROS bundle
@@ -17,7 +17,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please
 % - feel free to contact me.
 % -----------------------------------------------------------------------------
-% - Copyright 2011-2012 Clemens Niederberger
+% - Copyright 2011-2013 Clemens Niederberger
 % -
 % - This work may be distributed and/or modified under the
 % - conditions of the LaTeX Project Public License, either version 1.3
@@ -38,9 +38,9 @@
 %    https://bitbucket.org/cgnieder/cnpkgdoc/
 %    the class is licensed LPPL 1.3 or later
 % b) you need the following compilation order:
-%    > xelatex --shell-escape chemmacros_de (2 or probably 3 times)
+%    > xelatex chemmacros_de (2 or probably 3 times)
 %    > biber chemmacros_de
-%    > xelatex --shell-escape chemmacros_de (2 times)
+%    > xelatex chemmacros_de (2 times)
 %
 %
 \documentclass[DIV11,toc=index,toc=bib]{cnpkgdoc}
@@ -56,7 +56,7 @@
 \usepackage[varioref=false]{chemstyle}
 \usepackage{chemfig,upgreek,textgreek,booktabs,cancel}
 \usepackage[version=3]{mhchem}
-\usepackage{hologo}
+\usepackage{hologo,libertinehologopatch}
 \usepackage{fnpct}
 \usepackage[biblatex]{embrac}
 \ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
@@ -158,25 +158,36 @@
  \redox(r1,r2)[blue,-cf][-1]{\small\ch[font-spec={[Color=blue]Augie},math-space=.3em]{$+$ 2 e-}}}
 
 \addcmds{
-  a,abinitio,AddRxnDesc,anti,aq,aqi,b,ba,bottomrule,bridge,cancel,cd,cdot,ce,cee,celsius,
-  centering,chemabove,Chemalpha,Chembeta,Chemgamma,Chemdelta,ChemDelta,chemfig,
-  chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,CNMR,color,cstsetup,d,D,data,
-  DeclareChemArrow,DeclareChemIUPAC,DeclareChemLatin,DeclareChemNMR,
-  DeclareChemParticle,DeclareChemPhase,DeclareChemReaction,DeclareChemState,
-  DeclareInstance,DeclareSIUnit,definecolor,delm,delp,Delta,Dfi,draw,E,el,
-  electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,footnotesize,fmch,fpch,fscrm,
-  fscrp,g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,H,hapto,HNMR,Helmholtz,
-  hertz,hspace,includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,Ka,
-  Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,mch,mega,meta,metre,
-  mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,O,ominus,
-  orbital,ortho,oplus,ox,OX,p,P,para,pch,per,percent,pgfarrowsdeclarealias,
-  pgfarrowsrenewalias,pH,phase,photon,pKa,pKb,pOH,pos,positron,Pot,prt,R,Rad,
-  redox,RenewChemArrow,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
-  RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,rightarrow,S,Sf,
-  sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,sfrac,
-  shorthandoff,ShowChemArrow,si,SI,sisetup,sld,Sod,square,State,subsection,textcolor,
-  textendash,textsuperscript,tiny,toprule,trans,upbeta,upeta,upgamma,val,volt,
-  vphantom,vspave,w,xspace,Z}
+  a,abinitio,AddRxnDesc,anti,aq,aqi,
+  b,ba,bottomrule,bridge,
+  cancel,cd,cdot,ce,cee,celsius,centering,chemabove,Chemalpha,Chembeta,Chemgamma,
+    Chemdelta,ChemDelta,chemfig,chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,
+    CNMR,color,cstsetup,
+  d,D,data,DeclareChemArrow,DeclareChemBond,DeclareChemIUPAC,DeclareChemLatin,
+    DeclareChemNMR,DeclareChemParticle,DeclareChemPhase,DeclareChemReaction,
+    DeclareChemState,DeclareInstance,DeclareSIUnit,definecolor,delm,delp,Delta,
+    Dfi,draw,
+  E,el,electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,
+  footnotesize,fmch,fpch,fscrm,fscrp,
+  g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,
+  H,hapto,HNMR,Helmholtz,hertz,hspace,
+  includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,
+  Ka,Kb,kilo,Kw,
+  L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,
+  mch,mega,meta,metre,mhName,midrule,milli,mmHg,mole,
+  N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,
+  O,ominus,orbital,ortho,oplus,ox,OX,
+  p,P,para,pch,per,percent,pgfarrowsdeclarealias,pgfarrowsrenewalias,pH,phase,
+    photon,pKa,pKb,pOH,pos,positron,Pot,prt,
+  R,Rad,redox,RenewChemArrow,RenewChemBond,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
+    RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,rightarrow,
+  S,Sf,sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,sfrac,
+    shorthandoff,ShowChemArrow,ShowChemBond,si,SI,sisetup,sld,Sod,square,State,
+    subsection,
+  textcolor,textendash,textsuperscript,tiny,toprule,trans,
+  upbeta,upeta,upgamma,
+  val,volt,vphantom,vspave,
+  w,xspace,Z}
 
 \usepackage{imakeidx}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
@@ -186,8 +197,8 @@
   font-spec =
     {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
 }
-\renewcommand*\glqq{„}
-\renewcommand*\grqq{“}
+\def\glqq{„}
+\def\grqq{“}
 
 \part{Bevor es los geht}\secidx{BEVOR ES LOS GEHT}
 \section{Lizenz, Voraussetzungen und README}
@@ -2049,6 +2060,7 @@ kann:
    kann Werte zwischen \code{1} (undurchsichtig) bis \code{0} (unsichtbar) annehmen.
 \end{beschreibung}
 
+\newpage
 \begin{beispiel}[dist]
  \hspace{1cm}
  \chemsetup[orbital]{
@@ -2060,7 +2072,6 @@ kann:
  \vspace{7mm}
 \end{beispiel}
 
-\newpage
 \bspmidlength{dist}{10mm}
 \begin{beispiel}[dist]
  \hspace{2cm}
@@ -2372,16 +2383,16 @@ Der zweite Punkt folgt der \ac{iupac}-Empfehlung:
 
 \subsection{Bindungen}\label{ssec:bonds}\secidx[Bindungen]{Summenformeln}
 \subsubsection{Natürliche Bindungen}
-\chemformula kennt drei Sorten Bindungen, die ich "`natürliche Bindungen"' nennen
-werde:
+\chemformula kennt drei Sorten Bindungen, die ich \enquote{natürliche Bindungen}
+nennen werde:
 \begin{beispiel}
  einfach: \ch{CH3-CH3} \\
  doppel: \ch{CH2=CH2} \\
  dreifach: \ch{CH+CH}
 \end{beispiel}
 
-\subsubsection{Flexible Bonds}% TODO übersetzen
-\paragraph{Predefined Bonds}
+\subsubsection{Flexible Bindungen}
+\paragraph{Predefined Bindungen}
 Zusätzlich zu den drei natürlichen Bindungen gibt es ein paar weitere, die mit
 folgendem Befehl aufgerufen werden können:
 \begin{beschreibung}
@@ -2421,7 +2432,7 @@ können:
  \Befehl{DeclareChemBondAlias}{<new name>}\ma{<old name>}
  \Befehl{ShowChemBond}{<name>}
 \end{beschreibung}
-Die Verwednung wird am ehesten durch ein Beispiel beschrieben. Schauen Sie zunächst,
+Die Verwendung wird am ehesten durch ein Beispiel beschrieben. Schauen Sie zunächst,
 wie die \code{single} und die \code{co>} Bindung definiert sind:
 \begin{beispiel}[code only]
  \DeclareChemBond{single}
@@ -2486,7 +2497,7 @@ verschoben sind:\secidx[Ladungen!Verschiebung]{Summenformeln}
  \ch{SO4^2-} \ch{NH4+} \ch{Na+}
 \end{beispiel}
 Sie werden verschoben, wenn sie einer Tiefstellung \emph{folgen}, was der
-\ac{iupac}-Empfehlung entspricht~\cite[][p.\,51]{iupac:greenbook}. Den Betrag der
+\ac{iupac}-Empfehlung entspricht \cite[][p.\,51]{iupac:greenbook}. Den Betrag der
 Verschiebung kann man mit der Option \key{charge-hshift} festlegen.
 \begin{beispiel}
  \ch{SO4^2-} \ch{NH4+} \ch{Na+} \\
@@ -2497,7 +2508,7 @@ Verschiebung kann man mit der Option \key{charge-hshift} festlegen.
 \end{beispiel}
 
 Ungeachtet der \ac{iupac}-Empfehlung erstellt \chemformula keine voll gestaffelten
-Hochjstellungen in der Voreinstellung, da ich die in manchen Fällen schwer zu lesen
+Hochstellungen in der Voreinstellung, da ich die in manchen Fällen schwer zu lesen
 und in anderen Fällen hässlich finde. Da das aber eine subjektive Empfindung ist,
 gibt Ihnen \chemformula nicht nur die Möglichkeit, einen absoluten Wert für die
 Verschiebung festzulegen, sondern stellt auch eine Möglichkeit für voll gestaffelte
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
index 8d3b397db1a..66b24080268 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
index fd3bbee867d..45a9f081866 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_en.tex
@@ -1,7 +1,7 @@
-% arara: xelatex: { shell: true }
+% arara: xelatex
 % arara: biber
 % arara: xelatex
-% arara: xelatex: { shell: true }
+% arara: xelatex
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ----------------------------------------------------------------------------- 
 % - the CHEMMACROS bundle
@@ -38,9 +38,9 @@
 %    https://bitbucket.org/cgnieder/cnpkgdoc/
 %    the class is licensed LPPL 1.3 or later
 % b) you need the following compilation order:
-%    > xelatex --shell-escape chemmacros_en (2 or probably 3 times)
+%    > xelatex chemmacros_en (2 or probably 3 times)
 %    > biber chemmacros_en
-%    > xelatex --shell-escape chemmacros_en (2 times)
+%    > xelatex chemmacros_en (2 times)
 %
 \documentclass[DIV11,toc=index,toc=bib]{cnpkgdoc}
 \docsetup{
@@ -156,25 +156,36 @@
  \redox(r1,r2)[blue,-cf][-1]{\small\ch[font-spec={[Color=blue]Augie},math-space=.3em]{$+$ 2 e-}}}
 
 \addcmds{
-  a,abinitio,AddRxnDesc,anti,aq,aqi,b,ba,bond,bottomrule,bridge,cancel,cd,cdot,ce,
-  cee,celsius, centering,chemabove,Chemalpha,Chembeta,Chemgamma,Chemdelta,ChemDelta,
-  chemfig,chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,CNMR,color,cstsetup,d,
-  D,data,DeclareChemArrow,DeclareChemBond,DeclareChemBondAlias,DeclareChemIUPAC,
-  DeclareChemLatin,DeclareChemNMR,DeclareChemParticle,DeclareChemPhase,
-  DeclareChemReaction,DeclareChemState,DeclareInstance,DeclareSIUnit,definecolor,
-  delm,delp,Delta,Dfi,draw,E,el,electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,
-  footnotesize,fmch,fpch,fscrm,fscrp,g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,
-  grqq,H,hapto,HNMR,Helmholtz,hertz,hspace,includegraphics,insitu,intertext,invacuo,
-  iupac,IUPAC,J,joule,Ka,Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,
-  ltn,mch,mega,meta,metre,mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,
-  NMR,Nu,Nuc,num,numrange,O,ominus,orbital,ortho,oplus,ox,OX,p,P,para,pch,per,
-  percent,pgfarrowsdeclarealias,pgfarrowsrenewalias,pH,phase,photon,pKa,pKb,pOH,
-  pos,positron,Pot,prt,R,Rad,redox,RenewChemArrow,RenewChemIUPAC,RenewChemLatin,
-  RenewChemNMR,RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,
-  rightarrow,S,Sf,sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,
-  sfrac,shorthandoff,ShowChemArrow,ShowChemBond,si,SI,sisetup,sld,Sod,square,State,
-  subsection,textcolor,textendash,textsuperscript,tiny,toprule,trans,upbeta,upeta,
-  upgamma,val,volt,vphantom,vspave,w,xspace,Z}
+  a,abinitio,AddRxnDesc,anti,aq,aqi,
+  b,ba,bottomrule,bridge,
+  cancel,cd,cdot,ce,cee,celsius,centering,chemabove,Chemalpha,Chembeta,Chemgamma,
+    Chemdelta,ChemDelta,chemfig,chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,
+    CNMR,color,cstsetup,
+  d,D,data,DeclareChemArrow,DeclareChemBond,DeclareChemIUPAC,DeclareChemLatin,
+    DeclareChemNMR,DeclareChemParticle,DeclareChemPhase,DeclareChemReaction,
+    DeclareChemState,DeclareInstance,DeclareSIUnit,definecolor,delm,delp,Delta,
+    Dfi,draw,
+  E,el,electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,
+  footnotesize,fmch,fpch,fscrm,fscrp,
+  g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,
+  H,hapto,HNMR,Helmholtz,hertz,hspace,
+  includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,
+  Ka,Kb,kilo,Kw,
+  L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,
+  mch,mega,meta,metre,mhName,midrule,milli,mmHg,mole,
+  N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,
+  O,ominus,orbital,ortho,oplus,ox,OX,
+  p,P,para,pch,per,percent,pgfarrowsdeclarealias,pgfarrowsrenewalias,pH,phase,
+    photon,pKa,pKb,pOH,pos,positron,Pot,prt,
+  R,Rad,redox,RenewChemArrow,RenewChemBond,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
+    RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,rightarrow,
+  S,Sf,sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,sfrac,
+    shorthandoff,ShowChemArrow,ShowChemBond,si,SI,sisetup,sld,Sod,square,State,
+    subsection,
+  textcolor,textendash,textsuperscript,tiny,toprule,trans,
+  upbeta,upeta,upgamma,
+  val,volt,vphantom,vspave,
+  w,xspace,Z}
 
 \usepackage{imakeidx}
 \makeindex[columns=3,intoc,options={-sl \jobname.ist}]
@@ -184,8 +195,8 @@
   font-spec =
     {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
 }
-\renewcommand*\glqq{„}
-\renewcommand*\grqq{“}
+\def\glqq{„}
+\def\grqq{“}
 
 \part{Preliminaries}\secidx{PRELIMINARIES}
 \section{Licence, Requirements and README}
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
index 5958c8b7f55..3ba501e1294 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.pdf
diff --git a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
index fd263bad69a..8a97e5d8e42 100644
--- a/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
+++ b/Master/texmf-dist/doc/latex/chemmacros/chemmacros_it.tex
@@ -1,7 +1,7 @@
-% arara: xelatex: { shell: true }
+% arara: xelatex
 % arara: biber
 % arara: xelatex
-% arara: xelatex: { shell: true }
+% arara: xelatex
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % ----------------------------------------------------------------------------- 
 % - the CHEMMACROS bundle
@@ -38,9 +38,9 @@
 %    https://bitbucket.org/cgnieder/cnpkgdoc/
 %    the class is licensed LPPL 1.3 or later
 % b) you need the following compilation order:
-%    > xelatex --shell-escape chemmacros_it (2 or probably 3 times)
+%    > xelatex chemmacros_it (2 or probably 3 times)
 %    > biber chemmacros_it
-%    > xelatex --shell-escape chemmacros_it (2 times)
+%    > xelatex chemmacros_it (2 times)
 %
 \documentclass[DIV11,toc=index,toc=bib]{cnpkgdoc}
 \docsetup{
@@ -157,25 +157,36 @@
  \redox(r1,r2)[blue,-cf][-1]{\small\ch[font-spec={[Color=blue]Augie},math-space=.3em]{$+$ 2 e-}}}
 
 \addcmds{
-  a,abinitio,AddRxnDesc,anti,aq,aqi,b,ba,bond,bottomrule,bridge,cancel,cd,cdot,ce,
-  cee,celsius, centering,chemabove,Chemalpha,Chembeta,Chemgamma,Chemdelta,ChemDelta,
-  chemfig,chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,CNMR,color,cstsetup,d,
-  D,data,DeclareChemArrow,DeclareChemBond,DeclareChemBondAlias,DeclareChemIUPAC,
-  DeclareChemLatin,DeclareChemNMR,DeclareChemParticle,DeclareChemPhase,
-  DeclareChemReaction,DeclareChemState,DeclareInstance,DeclareSIUnit,definecolor,
-  delm,delp,Delta,Dfi,draw,E,el,electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,
-  footnotesize,fmch,fpch,fscrm,fscrp,g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,
-  grqq,H,hapto,HNMR,Helmholtz,hertz,hspace,includegraphics,insitu,intertext,invacuo,
-  iupac,IUPAC,J,joule,Ka,Kb,kilo,Kw,L,latin,lewis,Lewis,Lfi,listofreactions,lqd,
-  ltn,mch,mega,meta,metre,mhName,midrule,milli,mmHg,mole,N,nano,nicefrac,newman,
-  NMR,Nu,Nuc,num,numrange,O,ominus,orbital,ortho,oplus,ox,OX,p,P,para,pch,per,
-  percent,pgfarrowsdeclarealias,pgfarrowsrenewalias,pH,phase,photon,pKa,pKb,pOH,
-  pos,positron,Pot,prt,R,Rad,redox,RenewChemArrow,RenewChemIUPAC,RenewChemLatin,
-  RenewChemNMR,RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,
-  rightarrow,S,Sf,sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,
-  sfrac,shorthandoff,ShowChemArrow,ShowChemBond,si,SI,sisetup,sld,Sod,square,State,
-  subsection,textcolor,textendash,textsuperscript,tiny,toprule,trans,upbeta,upeta,
-  upgamma,val,volt,vphantom,vspave,w,xspace,Z}
+  a,abinitio,AddRxnDesc,anti,aq,aqi,
+  b,ba,bottomrule,bridge,
+  cancel,cd,cdot,ce,cee,celsius,centering,chemabove,Chemalpha,Chembeta,Chemgamma,
+    Chemdelta,ChemDelta,chemfig,chemname,Chemomega,chemsetup,cip,cis,ch,cnsetup,
+    CNMR,color,cstsetup,
+  d,D,data,DeclareChemArrow,DeclareChemBond,DeclareChemIUPAC,DeclareChemLatin,
+    DeclareChemNMR,DeclareChemParticle,DeclareChemPhase,DeclareChemReaction,
+    DeclareChemState,DeclareInstance,DeclareSIUnit,definecolor,delm,delp,Delta,
+    Dfi,draw,
+  E,el,electronvolt,ElPot,endo,Enthalpy,enthalpy,Entropy,
+  footnotesize,fmch,fpch,fscrm,fscrp,
+  g,gas,ghs,ghslistall,ghspic,Gibbs,glqq,gram,grqq,
+  H,hapto,HNMR,Helmholtz,hertz,hspace,
+  includegraphics,insitu,intertext,invacuo,iupac,IUPAC,J,joule,
+  Ka,Kb,kilo,Kw,
+  L,latin,lewis,Lewis,Lfi,listofreactions,lqd,ltn,
+  mch,mega,meta,metre,mhName,midrule,milli,mmHg,mole,
+  N,nano,nicefrac,newman,NMR,Nu,Nuc,num,numrange,
+  O,ominus,orbital,ortho,oplus,ox,OX,
+  p,P,para,pch,per,percent,pgfarrowsdeclarealias,pgfarrowsrenewalias,pH,phase,
+    photon,pKa,pKb,pOH,pos,positron,Pot,prt,
+  R,Rad,redox,RenewChemArrow,RenewChemBond,RenewChemIUPAC,RenewChemLatin,RenewChemNMR,
+    RenewChemParticle,RenewChemPhase,RenewChemState,renewtagform,rightarrow,
+  S,Sf,sample,scriptscriptstyle,scrm,scrp,second,setatomsep,setbondoffset,sfrac,
+    shorthandoff,ShowChemArrow,ShowChemBond,si,SI,sisetup,sld,Sod,square,State,
+    subsection,
+  textcolor,textendash,textsuperscript,tiny,toprule,trans,
+  upbeta,upeta,upgamma,
+  val,volt,vphantom,vspave,
+  w,xspace,Z}
   
 \newcommand*\pes{\mbox{p.\,es.}\xspace}
 
@@ -186,8 +197,8 @@
   font-spec =
     {[Color=chemformula,Numbers={Proportional,Lining}]Latin Modern Sans}
 }
-\renewcommand*\glqq{„}
-\renewcommand*\grqq{“}
+\def\glqq{„}
+\def\grqq{“}
 
 \part{Prima di cominciare}\secidx{PRIMA DI COMINCIARE}
 \section{Licenza, requisiti e LEGGIMI}
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
index c58a8f6fde9..d1ec7350dc8 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemformula.sty
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -91,14 +91,14 @@
 
 % --------------------------------------------------------------------------- %
 % scratch variables
-\tl_new:N  \l_chemformula_tmpa_tl
-\tl_new:N  \l_chemformula_tmpb_tl
-\tl_new:N  \l_chemformula_tmpc_tl
-\dim_new:N \l_chemformula_tmpa_dim
-\dim_new:N \l_chemformula_tmpb_dim
-\int_new:N \l_chemformula_tmpa_int
-\int_new:N \l_chemformula_tmpb_int
-\box_new:N \l_chemformula_tmpa_box
+\tl_new:N  \l__chemformula_tmpa_tl
+\tl_new:N  \l__chemformula_tmpb_tl
+\tl_new:N  \l__chemformula_tmpc_tl
+\dim_new:N \l__chemformula_tmpa_dim
+\dim_new:N \l__chemformula_tmpb_dim
+\int_new:N \l__chemformula_tmpa_int
+\int_new:N \l__chemformula_tmpb_int
+\box_new:N \l__chemformula_tmpa_box
 
 %-----------------------------------------------------------------------------%
 % gobble options
@@ -122,14 +122,14 @@
 \cs_new:Npn \chemformula_plus:
   {
     \bool_if:nTF
-      { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool }
+      { \l__chemmacros_circled_bool && !\l__chemmacros_circled_formal_bool }
       {
-        \bool_if:NTF \l_chemmacros_circled_chem_bool
+        \bool_if:NTF \l__chemmacros_circled_chem_bool
           { \chemmacros_fplus: }
           { \mode_if_math:TF { \oplus } { $ \oplus $ } }
       }
       {
-        \bool_if:NTF \l_chemformula_charge_style_math_bool
+        \bool_if:NTF \l__chemformula_charge_style_math_bool
           { \ensuremath { + } }
           { \mode_if_math:TF { \text { + } } { + } }
       }
@@ -138,65 +138,65 @@
 \cs_new:Npn \chemformula_minus:
   {
     \bool_if:nTF
-      { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool }
+      { \l__chemmacros_circled_bool && !\l__chemmacros_circled_formal_bool }
       {
-        \bool_if:NTF \l_chemmacros_circled_chem_bool
+        \bool_if:NTF \l__chemmacros_circled_chem_bool
           { \chemmacros_fminus: }
           { \mode_if_math:TF { \ominus } { $ \ominus $ } }
       }
       {
-        \bool_if:NTF \l_chemformula_charge_style_math_bool
+        \bool_if:NTF \l__chemformula_charge_style_math_bool
           { \ensuremath { - } }
           { \mode_if_math:TF { \text { \textendash } } { \textendash } }
       }
   }
 
-\tl_new:N   \l_chemformula_radical_style_tl
-\dim_new:N  \l_chemformula_radical_radius_dim
-\dim_set:Nn \l_chemformula_radical_radius_dim { .2ex }
+\tl_new:N   \l__chemformula_radical_style_tl
+\dim_new:N  \l__chemformula_radical_radius_dim
+\dim_set:Nn \l__chemformula_radical_radius_dim { .2ex }
 
 \cs_new:Npn \chemformula_radical:
   {
     \chemformula_tikz:xn
       {
-        \l_chemformula_radical_style_tl ,
+        \l__chemformula_radical_style_tl ,
         baseline,
         minimum~height=0pt,
         inner~sep=0pt,
         outer~sep=0pt
       }
-      { \fill (0,0)++(.3ex,.7ex) circle (\l_chemformula_radical_radius_dim) ; }
+      { \fill (0,0)++(.3ex,.7ex) circle (\l__chemformula_radical_radius_dim) ; }
   }
 
 \keys_define:nn { chemformula }
   {
-    radical-style  .tl_set:N  = \l_chemformula_radical_style_tl ,
-    radical-radius .dim_set:N = \l_chemformula_radical_radius_dim
+    radical-style  .tl_set:N  = \l__chemformula_radical_style_tl ,
+    radical-radius .dim_set:N = \l__chemformula_radical_radius_dim
   }
 
 \cs_new:Npn \chemformula_adduct:
   {
-    \skip_horizontal:N \l_chemformula_cdot_space_dim
+    \skip_horizontal:N \l__chemformula_cdot_space_dim
     \textperiodcentered
-    \skip_horizontal:N \l_chemformula_cdot_space_dim
+    \skip_horizontal:N \l__chemformula_cdot_space_dim
   }
 \cs_new_eq:NN \chemformula_star_adduct: \chemformula_adduct:
 
 %-----------------------------------------------------------------------------%
 % ARROW DEFINITION
 % arrow heads:
-\dim_new:N \l_chemformula_arrow_head_dim
+\dim_new:N \l__chemformula_arrow_head_dim
 
 % full tip for pairs
 \pgfarrowsdeclare { cf } { cf }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemformula_arrow_head_dim }
+  \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -205,16 +205,16 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemformula_arrow_head_dim }
-        { .3\l_chemformula_arrow_head_dim }
+        { -\l__chemformula_arrow_head_dim }
+        { .3\l__chemformula_arrow_head_dim }
     }
   \pgfpathlineto
-    { \pgfpoint { -.5\l_chemformula_arrow_head_dim } { 0pt } }
+    { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } }
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemformula_arrow_head_dim }
-        { -.3\l_chemformula_arrow_head_dim }
+        { -\l__chemformula_arrow_head_dim }
+        { -.3\l__chemformula_arrow_head_dim }
     }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
@@ -223,13 +223,13 @@
 % half tip on the left
 \pgfarrowsdeclare { left~cf } { left~cf }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemformula_arrow_head_dim }
+  \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -238,10 +238,10 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemformula_arrow_head_dim }
-        { .3\l_chemformula_arrow_head_dim }
+        { -\l__chemformula_arrow_head_dim }
+        { .3\l__chemformula_arrow_head_dim }
     }
-  \pgfpathlineto { \pgfpoint { -.5\l_chemformula_arrow_head_dim } { 0pt } }
+  \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
 }
@@ -249,13 +249,13 @@
 % half tip in the right
 \pgfarrowsdeclare { right~cf } { right~cf }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemformula_arrow_head_dim }
+  \pgfarrowsleftextend { -\l__chemformula_arrow_head_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemformula_arrow_head_dim
+  \dim_set:Nn \l__chemformula_arrow_head_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -264,10 +264,10 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemformula_arrow_head_dim }
-        { -.3\l_chemformula_arrow_head_dim }
+        { -\l__chemformula_arrow_head_dim }
+        { -.3\l__chemformula_arrow_head_dim }
     }
-  \pgfpathlineto { \pgfpoint { -.5\l_chemformula_arrow_head_dim } { 0pt } }
+  \pgfpathlineto { \pgfpoint { -.5\l__chemformula_arrow_head_dim } { 0pt } }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
 }
@@ -281,100 +281,100 @@
 
 %-----------------------------------------------------------------------------%
 % dimension variables
-\dim_new:N \l_chemformula_arrow_length_dim
+\dim_new:N \l__chemformula_arrow_length_dim
 
-\dim_new:N \l_chemformula_arrow_label_offset_dim
-\dim_set:Nn \l_chemformula_arrow_label_offset_dim { 2pt }
+\dim_new:N \l__chemformula_arrow_label_offset_dim
+\dim_set:Nn \l__chemformula_arrow_label_offset_dim { 2pt }
 
-\dim_new:N \l_chemformula_arrow_shortage_dim
-\tl_new:N \l_chemformula_arrow_ratio_tl
-\tl_set:Nn \l_chemformula_arrow_ratio_tl { .6 }
+\dim_new:N \l__chemformula_arrow_shortage_dim
+\tl_new:N \l__chemformula_arrow_ratio_tl
+\tl_set:Nn \l__chemformula_arrow_ratio_tl { .6 }
 
-\dim_new:N \l_chemformula_arrow_offset_dim
-\dim_set:Nn \l_chemformula_arrow_offset_dim { 1.5ex }
+\dim_new:N \l__chemformula_arrow_offset_dim
+\dim_set:Nn \l__chemformula_arrow_offset_dim { 1.5ex }
 
-\dim_new:N \l_chemformula_compound_sep_dim
-\dim_set:Nn \l_chemformula_compound_sep_dim { \medskipamount }
+\dim_new:N \l__chemformula_compound_sep_dim
+\dim_set:Nn \l__chemformula_compound_sep_dim { \medskipamount }
 
-\dim_new:N \l_chemformula_arrow_yshift_dim
-\dim_set:Nn \l_chemformula_arrow_yshift_dim { 0pt }
+\dim_new:N \l__chemformula_arrow_yshift_dim
+\dim_set:Nn \l__chemformula_arrow_yshift_dim { 0pt }
 
 % determine length in dependency of labels
 \cs_new:Npn \chemformula_determine_arrow_length:nn #1#2
   {
-    \box_set_eq:NN \l_chemformula_tmpa_box #1
-    \dim_set:Nn \l_chemformula_tmpa_dim { \box_wd:N \l_chemformula_tmpa_box }
-    \box_set_eq:NN \l_chemformula_tmpa_box #2
-    \dim_set:Nn \l_chemformula_tmpb_dim { \box_wd:N \l_chemformula_tmpa_box }
-    \box_clear:N \l_chemformula_tmpa_box
-    \dim_compare:nTF { \l_chemformula_tmpa_dim >= \l_chemformula_tmpb_dim }
-      { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_chemformula_tmpa_dim }
-      { \dim_set_eq:NN \l_chemformula_arrow_length_dim \l_chemformula_tmpb_dim }
-    \dim_add:Nn \l_chemformula_arrow_length_dim
-      { \l_chemformula_arrow_offset_dim }
-    \dim_add:Nn \l_chemformula_arrow_length_dim
-      { \l_chemformula_arrow_offset_dim }
-    \dim_set:Nn \l_chemformula_arrow_shortage_dim
+    \box_set_eq:NN \l__chemformula_tmpa_box #1
+    \dim_set:Nn \l__chemformula_tmpa_dim { \box_wd:N \l__chemformula_tmpa_box }
+    \box_set_eq:NN \l__chemformula_tmpa_box #2
+    \dim_set:Nn \l__chemformula_tmpb_dim { \box_wd:N \l__chemformula_tmpa_box }
+    \box_clear:N \l__chemformula_tmpa_box
+    \dim_compare:nTF { \l__chemformula_tmpa_dim >= \l__chemformula_tmpb_dim }
+      { \dim_set_eq:NN \l__chemformula_arrow_length_dim \l__chemformula_tmpa_dim }
+      { \dim_set_eq:NN \l__chemformula_arrow_length_dim \l__chemformula_tmpb_dim }
+    \dim_add:Nn \l__chemformula_arrow_length_dim
+      { \l__chemformula_arrow_offset_dim }
+    \dim_add:Nn \l__chemformula_arrow_length_dim
+      { \l__chemformula_arrow_offset_dim }
+    \dim_set:Nn \l__chemformula_arrow_shortage_dim
       {
-        \l_chemformula_arrow_length_dim *
-        \dim_ratio:nn { \l_chemformula_arrow_ratio_tl pt } { 1pt }
+        \l__chemformula_arrow_length_dim *
+        \dim_ratio:nn { \l__chemformula_arrow_ratio_tl pt } { 1pt }
       }
-    \dim_set:Nn \l_chemformula_arrow_shortage_dim
-      { \l_chemformula_arrow_length_dim - \l_chemformula_arrow_shortage_dim }
-    \dim_set:Nn \l_chemformula_arrow_shortage_dim
+    \dim_set:Nn \l__chemformula_arrow_shortage_dim
+      { \l__chemformula_arrow_length_dim - \l__chemformula_arrow_shortage_dim }
+    \dim_set:Nn \l__chemformula_arrow_shortage_dim
       {
-        \l_chemformula_arrow_shortage_dim *
+        \l__chemformula_arrow_shortage_dim *
         \dim_ratio:nn { 1pt } { 2pt }
       }
   }
 
 %-----------------------------------------------------------------------------%
 % define arrow types
-\tl_new:N \l_chemformula_arrow_head_tl
-\tl_set:Nn \l_chemformula_arrow_head_tl { cf }
-\tl_new:N \l_chemformula_upper_label_tl
-\tl_new:N \l_chemformula_lower_label_tl
-\tl_new:N \l_chemformula_arrow_style_tl
-\tl_new:N \l_chemformula_arrow_label_style_tl
-\tl_set:Nn \l_chemformula_arrow_label_style_tl { \footnotesize }
-
-\prop_new:N \l_chemformula_arrows_code_prop
-\seq_new:N \l_chemformula_arrows_type_seq
-\tl_new:N \l_chemformula_arrow_type_tl
-\box_new:N \l_chemformula_arrow_arg_i_box
-\box_new:N \l_chemformula_arrow_arg_ii_box
+\tl_new:N \l__chemformula_arrow_head_tl
+\tl_set:Nn \l__chemformula_arrow_head_tl { cf }
+\tl_new:N \l__chemformula_upper_label_tl
+\tl_new:N \l__chemformula_lower_label_tl
+\tl_new:N \l__chemformula_arrow_style_tl
+\tl_new:N \l__chemformula_arrow_label_style_tl
+\tl_set:Nn \l__chemformula_arrow_label_style_tl { \footnotesize }
+
+\prop_new:N \l__chemformula_arrows_code_prop
+\seq_new:N \l__chemformula_arrows_type_seq
+\tl_new:N \l__chemformula_arrow_type_tl
+\box_new:N \l__chemformula_arrow_arg_i_box
+\box_new:N \l__chemformula_arrow_arg_ii_box
 
 % read optional arguments
-\cs_new_nopar:Npn \l_chemformula_arrow_read_args:w
+\cs_new_nopar:Npn \l__chemformula_arrow_read_args:w
   {
     \peek_meaning:NTF [
-      { \l_chemformula_arrow_read_args_aux_i:w }
-      { \l_chemformula_arrow_read_args_aux_iii: }
+      { \l__chemformula_arrow_read_args_aux_i:w }
+      { \l__chemformula_arrow_read_args_aux_iii: }
   }
 
-\cs_new_nopar:Npn \l_chemformula_arrow_read_args_aux_i:w [#1]
+\cs_new_nopar:Npn \l__chemformula_arrow_read_args_aux_i:w [#1]
   {
-    \hbox_set:Nn \l_chemformula_arrow_arg_i_box
-      { \tl_use:N \l_chemformula_arrow_label_style_tl #1 }
+    \hbox_set:Nn \l__chemformula_arrow_arg_i_box
+      { \tl_use:N \l__chemformula_arrow_label_style_tl #1 }
     \peek_meaning:NTF [
-      { \l_chemformula_arrow_read_args_aux_ii:w }
-      { \l_chemformula_arrow_read_args_aux_iii: }
+      { \l__chemformula_arrow_read_args_aux_ii:w }
+      { \l__chemformula_arrow_read_args_aux_iii: }
   }
 
-\cs_new_nopar:Npn \l_chemformula_arrow_read_args_aux_ii:w [#1]
+\cs_new_nopar:Npn \l__chemformula_arrow_read_args_aux_ii:w [#1]
   {
-    \hbox_set:Nn \l_chemformula_arrow_arg_ii_box
-      { \tl_use:N \l_chemformula_arrow_label_style_tl #1 }
-    \l_chemformula_arrow_read_args_aux_iii:
+    \hbox_set:Nn \l__chemformula_arrow_arg_ii_box
+      { \tl_use:N \l__chemformula_arrow_label_style_tl #1 }
+    \l__chemformula_arrow_read_args_aux_iii:
   }
 
-\cs_new_nopar:Npn \l_chemformula_arrow_read_args_aux_iii:
+\cs_new_nopar:Npn \l__chemformula_arrow_read_args_aux_iii:
   {
     % now we have both arguments do the actual drawing:
-    \prop_get:NVN \l_chemformula_arrows_code_prop
-      \l_chemformula_arrow_type_tl
-      \l_chemformula_tmpb_tl
-    \chemformula_arrow_draw:V \l_chemformula_tmpb_tl
+    \prop_get:NVN \l__chemformula_arrows_code_prop
+      \l__chemformula_arrow_type_tl
+      \l__chemformula_tmpb_tl
+    \chemformula_arrow_draw:V \l__chemformula_tmpb_tl
   }
 
 % get arrows (for the use in \ch to replace the symbol)
@@ -382,11 +382,11 @@
 \cs_new_nopar:Npn \chemformula_arrows_get:n #1
   {
     % first clear the arguments
-    \box_clear:N \l_chemformula_arrow_arg_i_box
-    \box_clear:N \l_chemformula_arrow_arg_ii_box
+    \box_clear:N \l__chemformula_arrow_arg_i_box
+    \box_clear:N \l__chemformula_arrow_arg_ii_box
     % then get the arrow type
-    \tl_set:Nn \l_chemformula_arrow_type_tl { #1 }
-    \l_chemformula_arrow_read_args:w
+    \tl_set:Nn \l__chemformula_arrow_type_tl { #1 }
+    \l__chemformula_arrow_read_args:w
   }
 
 % draw the arrows
@@ -394,42 +394,42 @@
   {
     % prepare arrow code for drawing:
     % TODO: flexible Pfeilspitzen, TikZ-Keys ermöglichen
-    \tl_set_rescan:Nnn \l_chemformula_tmpc_tl { \char_set_catcode_letter:N \_ } { #1 }
+    \tl_set_rescan:Nnn \l__chemformula_tmpc_tl { \char_set_catcode_letter:N \_ } { #1 }
     % determine length of the arrow
     \chemformula_determine_arrow_length:NN
-      \l_chemformula_arrow_arg_i_box
-      \l_chemformula_arrow_arg_ii_box
+      \l__chemformula_arrow_arg_i_box
+      \l__chemformula_arrow_arg_ii_box
     \chemformula_tikz:nf
       { inner~sep=0, baseline=(chemformula_arrow_start.base) }
       {
         % the coordinates
         \chemformula_draw:xn
-          { \l_chemformula_arrow_style_tl }
+          { \l__chemformula_arrow_style_tl }
           {
             coordinate (chemformula_arrow_start) (0,0)
-            ++ (\l_chemformula_compound_sep_dim,.3432em)
-            ++ (0,\l_chemformula_arrow_yshift_dim)
+            ++ (\l__chemformula_compound_sep_dim,.3432em)
+            ++ (0,\l__chemformula_arrow_yshift_dim)
             coordinate (cf_arrow_start)
-            ++ ( .5 * \dim_use:N \l_chemformula_arrow_length_dim , 0)
+            ++ ( .5 * \dim_use:N \l__chemformula_arrow_length_dim , 0)
             coordinate (cf_arrow_mid)
-            ++ ( .5 * \dim_use:N \l_chemformula_arrow_length_dim , 0)
+            ++ ( .5 * \dim_use:N \l__chemformula_arrow_length_dim , 0)
             coordinate (cf_arrow_end)
-            ++ (\l_chemformula_compound_sep_dim,0)
-            (cf_arrow_start) ++ (\l_chemformula_arrow_shortage_dim,0)
+            ++ (\l__chemformula_compound_sep_dim,0)
+            (cf_arrow_start) ++ (\l__chemformula_arrow_shortage_dim,0)
             coordinate (cf_arrow_mid_start)
-            (cf_arrow_end) ++ (-\l_chemformula_arrow_shortage_dim , 0)
+            (cf_arrow_end) ++ (-\l__chemformula_arrow_shortage_dim , 0)
             coordinate (cf_arrow_mid_end)
           }
         % the arrow labels:
         \draw
             node
-              [ above=\l_chemformula_arrow_label_offset_dim ] at (cf_arrow_mid)
-              { \box_use:N \l_chemformula_arrow_arg_i_box }
+              [ above=\l__chemformula_arrow_label_offset_dim ] at (cf_arrow_mid)
+              { \box_use:N \l__chemformula_arrow_arg_i_box }
             node
-              [ below=\l_chemformula_arrow_label_offset_dim ] at (cf_arrow_mid)
-              { \box_use:N \l_chemformula_arrow_arg_ii_box }
+              [ below=\l__chemformula_arrow_label_offset_dim ] at (cf_arrow_mid)
+              { \box_use:N \l__chemformula_arrow_arg_ii_box }
           ;
-        \tl_use:N \l_chemformula_tmpc_tl
+        \tl_use:N \l__chemformula_tmpc_tl
       }
   }
 \cs_generate_variant:Nn \chemformula_arrow_draw:n { V }
@@ -439,26 +439,26 @@
 %  #1: symbol, #2: code
 \NewDocumentCommand \DeclareChemArrow { mm }
   {
-    \prop_if_in:NnTF \l_chemformula_arrows_code_prop { #1 }
+    \prop_if_in:NnTF \l__chemformula_arrows_code_prop { #1 }
       { \chemmacros_msg:nnxx { chemformula } { declare-arrow } { #1 } {} }
       {
         % store type in the sequence and code in the property list
-        \seq_put_right:Nn \l_chemformula_arrows_type_seq { #1 }
-        \prop_put:Nnn \l_chemformula_arrows_code_prop { #1 } { #2 }
+        \seq_put_right:Nn \l__chemformula_arrows_type_seq { #1 }
+        \prop_put:Nnn \l__chemformula_arrows_code_prop { #1 } { #2 }
       }
   }
 
 \NewDocumentCommand \RenewChemArrow { mm }
   {
-    \prop_if_in:NnTF \l_chemformula_arrows_code_prop { #1 }
-      { \prop_put:Nnn \l_chemformula_arrows_code_prop { #1 } { #2 } }
+    \prop_if_in:NnTF \l__chemformula_arrows_code_prop { #1 }
+      { \prop_put:Nnn \l__chemformula_arrows_code_prop { #1 } { #2 } }
       { \chemmacros_msg:nnxx { chemformula } { renew-arrow } { #1 } {} }
   }
 
 \NewDocumentCommand \ShowChemArrow { m }
   {
-    \prop_get:NnN \l_chemformula_arrows_code_prop { #1 } \l_chemformula_tmpa_tl
-    \tl_to_str:N \l_chemformula_tmpa_tl
+    \prop_get:NnN \l__chemformula_arrows_code_prop { #1 } \l__chemformula_tmpa_tl
+    \tl_to_str:N \l__chemformula_tmpa_tl
   }
 
 % declare arrows in the right order
@@ -520,37 +520,41 @@
 % arrow customization
 \keys_define:nn { chemmacros / chemformula }
   {
-    arrow-offset .dim_set:N = \l_chemformula_arrow_offset_dim ,
-    arrow-yshift .dim_set:N = \l_chemformula_arrow_yshift_dim ,
-    arrow-ratio  .tl_set:N  = \l_chemformula_arrow_ratio_tl ,
-    label-offset .dim_set:N = \l_chemformula_arrow_label_offset_dim ,
-    compound-sep .dim_set:N = \l_chemformula_compound_sep_dim ,
-%     arrow-tips   .tl_set:N  = \l_chemformula_arrow_head_tl ,
-    arrow-style  .tl_set:N  = \l_chemformula_arrow_style_tl ,
-    label-style  .tl_set:N  = \l_chemformula_arrow_label_style_tl
+    arrow-offset .dim_set:N = \l__chemformula_arrow_offset_dim ,
+    arrow-yshift .dim_set:N = \l__chemformula_arrow_yshift_dim ,
+    arrow-ratio  .tl_set:N  = \l__chemformula_arrow_ratio_tl ,
+    label-offset .dim_set:N = \l__chemformula_arrow_label_offset_dim ,
+    compound-sep .dim_set:N = \l__chemformula_compound_sep_dim ,
+%     arrow-tips   .tl_set:N  = \l__chemformula_arrow_head_tl ,
+    arrow-style  .tl_set:N  = \l__chemformula_arrow_style_tl ,
+    label-style  .tl_set:N  = \l__chemformula_arrow_label_style_tl
   }
 
 %-----------------------------------------------------------------------------%
+\seq_new:N \l__chemformula_input_seq
 % MAIN COMMAND
-\NewDocumentCommand \chemformula_ch_main:w { > { \SplitList { ~ } } m }
+\cs_new:Npn \chemformula_ch_main:n #1
   {
     \group_begin:
+      \seq_set_split:Nnn \l__chemformula_input_seq { ~ } { #1 }
       \cs_set_eq:NN \xspace \scan_stop:
       \cs_set_nopar:Npn \[ { [ }
       \cs_set_nopar:Npn \] { ] }
-      \bool_set_true:N \l_chemformula_inside_ch_bool
-      \tl_if_blank:oF { \g_chemformula_options_tl }
+      \bool_set_true:N \l__chemformula_inside_ch_bool
+      \tl_if_blank:oF { \g__chemformula_options_tl }
         {
           \keys_set:no { chemmacros / chemformula }
-            { \g_chemformula_options_tl }
+            { \g__chemformula_options_tl }
         }
-      \tl_map_function:nN { #1 } \chemformula_input:n
-      \chemformula_generate_arrows:V \l_chemformula_input_tl
-      \chemformula_generate_name:V \l_chemformula_output_tl
-      \tl_set_rescan:Nno \l_chemformula_output_tl
+      \seq_map_function:NN
+        \l__chemformula_input_seq
+        \chemformula_input:n
+      \chemformula_generate_arrows:V \l__chemformula_input_tl
+      \chemformula_generate_name:V \l__chemformula_output_tl
+      \tl_set_rescan:Nno \l__chemformula_output_tl
         { \ExplSyntaxOn \makeatletter }
-        { \l_chemformula_output_tl }
-      \chemformula_write:V \l_chemformula_output_tl
+        { \l__chemformula_output_tl }
+      \chemformula_write:V \l__chemformula_output_tl
     \group_end:
   }
 
@@ -559,12 +563,12 @@
     \group_align_safe_begin:
       \chemmacros_leave_vmode:
       \IfNoValueTF { #1 }
-        { \tl_gclear:N \g_chemformula_options_tl }
-        { \tl_gset:Nn \g_chemformula_options_tl { #1 } }
+        { \tl_gclear:N \g__chemformula_options_tl }
+        { \tl_gset:Nn \g__chemformula_options_tl { #1 } }
       \chemformula_ch_aux_i:w #2 \\ \q_no_value \q_stop
     \group_align_safe_end:
-    \tl_use:N \g_chemformula_output_tl
-    \tl_gclear:N \g_chemformula_output_tl
+    \tl_use:N \g__chemformula_output_tl
+    \tl_gclear:N \g__chemformula_output_tl
   }
 
 % Trickery to use \ch inside align environment:
@@ -574,7 +578,7 @@
     \chemformula_ch_aux_ii:w #1 & \q_no_value \q_stop
     \quark_if_no_value:nF { #2 }
       {
-        \tl_gput_right:Nn \g_chemformula_output_tl { \\ }
+        \tl_gput_right:Nn \g__chemformula_output_tl { \\ }
         \chemformula_ch_aux_i:w #2 \q_stop
       }
   }
@@ -585,7 +589,7 @@
     \chemformula_ch_aux_iii:w #1 \label{} \q_no_value \q_stop
     \quark_if_no_value:nF { #2 }
       {
-        \tl_gput_right:Nn \g_chemformula_output_tl { & }
+        \tl_gput_right:Nn \g__chemformula_output_tl { & }
         \chemformula_ch_aux_ii:w #2 \q_stop
       } 
   }
@@ -596,7 +600,7 @@
     \chemformula_ch_aux_iv:w #1 \tag{} \q_no_value \q_stop
     \quark_if_no_value:nF { #3 }
       {
-        \tl_gput_right:Nn \g_chemformula_output_tl { \label{#2} }
+        \tl_gput_right:Nn \g__chemformula_output_tl { \label{#2} }
         \chemformula_ch_aux_iii:w #3 \q_stop
       } 
   }
@@ -607,7 +611,7 @@
     \chemformula_ch_aux_v:w #1 \intertext{} \q_no_value \q_stop
     \quark_if_no_value:nF { #3 }
       {
-        \tl_gput_right:Nn \g_chemformula_output_tl { \tag{#2} }
+        \tl_gput_right:Nn \g__chemformula_output_tl { \tag{#2} }
         \chemformula_ch_aux_iv:w #3 \q_stop
       } 
   }
@@ -615,11 +619,11 @@
 % bypass \intertext:
 \cs_new:Npn \chemformula_ch_aux_v:w #1 \intertext#2 #3 \q_stop
   {
-    \tl_gput_right:Nn \g_chemformula_output_tl
-      { \chemformula_ch_main:w { #1 } }
+    \tl_gput_right:Nn \g__chemformula_output_tl
+      { \chemformula_ch_main:n { #1 } }
     \quark_if_no_value:nF { #3 }
       {
-        \tl_gput_right:Nn \g_chemformula_output_tl { \intertext{#2} }
+        \tl_gput_right:Nn \g__chemformula_output_tl { \intertext{#2} }
         \chemformula_ch_aux_v:w #3 \q_stop
       } 
   }
@@ -646,29 +650,29 @@
 % arrow generation & detection
 \cs_set:Nn \chemformula_generate_arrows:V
   {
-    \tl_set:No \l_chemformula_tmpa_tl { #1 }
-    \seq_map_inline:Nn \l_chemformula_arrows_type_seq
+    \tl_set:No \l__chemformula_tmpa_tl { #1 }
+    \seq_map_inline:Nn \l__chemformula_arrows_type_seq
       {
-        \tl_replace_all:Nnn \l_chemformula_tmpa_tl
+        \tl_replace_all:Nnn \l__chemformula_tmpa_tl
           { ##1 } { \chemformula_arrows_get:n { ##1 } }
       }
-    \tl_set_eq:NN \l_chemformula_output_tl \l_chemformula_tmpa_tl
+    \tl_set_eq:NN \l__chemformula_output_tl \l__chemformula_tmpa_tl
   }
 
 \cs_new:Npn \chemformula_detect_arrows:n #1
   {
-    \bool_set_false:N \l_chemformula_is_arrow_bool
-    \prop_map_inline:Nn \l_chemformula_arrows_code_prop
+    \bool_set_false:N \l__chemformula_is_arrow_bool
+    \prop_map_inline:Nn \l__chemformula_arrows_code_prop
       {
-        \tl_set_rescan:Nnn \l_chemformula_tmpa_tl {} { ##1 }
-        \tl_if_in:noT { #1 } { \l_chemformula_tmpa_tl }
-          { \bool_set_true:N \l_chemformula_is_arrow_bool }
+        \tl_set_rescan:Nnn \l__chemformula_tmpa_tl {} { ##1 }
+        \tl_if_in:noT { #1 } { \l__chemformula_tmpa_tl }
+          { \bool_set_true:N \l__chemformula_is_arrow_bool }
       }
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % compound names
-\dim_new:N \l_chemformula_name_dim
+\dim_new:N \l__chemformula_name_dim
 
 \cs_new:Npn \chemformula_name_cmpd:w
   { \peek_meaning:NTF ( { \chemformula_name_cmpd_aux:w } { ! } }
@@ -679,225 +683,225 @@
     \(
     \underset
       {
-        \bool_if:NF \l_chemformula_name_width_bool
+        \bool_if:NF \l__chemformula_name_width_bool
           {
-            \width_to_dim:Nn \l_chemformula_name_dim
-              { \l_chemformula_name_format_tl #1 }
+            \chemformula_width_to_dim:Nn \l__chemformula_name_dim
+              { \l__chemformula_name_format_tl #1 }
           }
         \parbox
-          { \dim_use:N \l_chemformula_name_dim }
-          { \l_chemformula_name_format_tl #1 }
+          { \dim_use:N \l__chemformula_name_dim }
+          { \l__chemformula_name_format_tl #1 }
       }
       { \text { \vphantom{\gas} #2 } }
     \)
   }
 
-\cs_new:Npn \width_to_dim:Nn #1#2
+\cs_new:Npn \chemformula_width_to_dim:Nn #1#2
   {
-    \hbox_set:Nn \l_chemformula_tmpa_box { #2 }
-    \dim_set:Nn #1 { \box_wd:N \l_chemformula_tmpa_box }
-    \box_clear:N \l_chemformula_tmpa_box
+    \hbox_set:Nn \l__chemformula_tmpa_box { #2 }
+    \dim_set:Nn #1 { \box_wd:N \l__chemformula_tmpa_box }
+    \box_clear:N \l__chemformula_tmpa_box
   }
 
 \cs_new:Npn \chemformula_generate_name:n #1
   {
-    \tl_set:Nn \l_chemformula_tmpa_tl { #1 }
-    \tl_if_in:VnT \l_chemformula_tmpa_tl { ! }
-      { \tl_replace_all:Nnn \l_chemformula_tmpa_tl { ! } { \chemformula_name_cmpd:w } }
-    \tl_set_eq:NN \l_chemformula_output_tl \l_chemformula_tmpa_tl
+    \tl_set:Nn \l__chemformula_tmpa_tl { #1 }
+    \tl_if_in:VnT \l__chemformula_tmpa_tl { ! }
+      { \tl_replace_all:Nnn \l__chemformula_tmpa_tl { ! } { \chemformula_name_cmpd:w } }
+    \tl_set_eq:NN \l__chemformula_output_tl \l__chemformula_tmpa_tl
   }
 \cs_generate_variant:Nn \chemformula_generate_name:n { V }
 
 \cs_new:Npn \chemformula_detect_name:n #1
   {
-     \bool_set_false:N \l_chemformula_is_name_bool
-     \tl_set:Nn \l_chemformula_tmpa_tl { #1 }
-     \tl_if_in:VnT \l_chemformula_tmpa_tl { ! }
-       { \bool_set_true:N \l_chemformula_is_name_bool }
+     \bool_set_false:N \l__chemformula_is_name_bool
+     \tl_set:Nn \l__chemformula_tmpa_tl { #1 }
+     \tl_if_in:VnT \l__chemformula_tmpa_tl { ! }
+       { \bool_set_true:N \l__chemformula_is_name_bool }
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % parsing input
 % booleans:
-\bool_new:N \l_chemformula_inside_ch_bool
-\bool_new:N \l_chemformula_options_bool
-\bool_new:N \l_chemformula_is_option_bool
-\bool_new:N \l_chemformula_stoich_bool
-\bool_new:N \l_chemformula_is_plus_bool
-\bool_new:N \l_chemformula_is_up_bool
-\bool_new:N \l_chemformula_is_down_bool
-\bool_new:N \l_chemformula_is_arrow_bool
-\bool_new:N \l_chemformula_is_name_bool
-\bool_new:N \l_chemformula_first_last_text_bool
-\bool_new:N \l_chemformula_first_last_double_bool
-\bool_new:N \l_chemformula_first_last_single_bool
-\bool_new:N \l_chemformula_first_last_math_bool
-\bool_new:N \l_chemformula_number_style_math_bool
-\bool_new:N \l_chemformula_charge_style_math_bool
-\bool_new:N \l_chemformula_sub_bool
-\bool_new:N \l_chemformula_sup_bool
-\bool_new:N \l_chemformula_is_isotope_bool
-\bool_new:N \l_chemformula_xfrac_bool
-\bool_new:N \l_chemformula_nicefrac_bool
-\bool_new:N \l_chemformula_mathfrac_bool
-  \bool_set_true:N \l_chemformula_mathfrac_bool
-\bool_new:N \l_chemformula_fss_bool
-\bool_new:N \l_chemformula_fontspec_bool
-\bool_new:N \l_chemformula_fss_family_bool
-\bool_new:N \l_chemformula_fss_series_bool
-\bool_new:N \l_chemformula_fss_shape_bool
-\bool_new:N \l_chemformula_name_width_bool
-\bool_new:N \l_chemformula_charge_full_shift_bool
+\bool_new:N \l__chemformula_inside_ch_bool
+\bool_new:N \l__chemformula_options_bool
+\bool_new:N \l__chemformula_is_option_bool
+\bool_new:N \l__chemformula_stoich_bool
+\bool_new:N \l__chemformula_is_plus_bool
+\bool_new:N \l__chemformula_is_up_bool
+\bool_new:N \l__chemformula_is_down_bool
+\bool_new:N \l__chemformula_is_arrow_bool
+\bool_new:N \l__chemformula_is_name_bool
+\bool_new:N \l__chemformula_first_last_text_bool
+\bool_new:N \l__chemformula_first_last_double_bool
+\bool_new:N \l__chemformula_first_last_single_bool
+\bool_new:N \l__chemformula_first_last_math_bool
+\bool_new:N \l__chemformula_number_style_math_bool
+\bool_new:N \l__chemformula_charge_style_math_bool
+\bool_new:N \l__chemformula_sub_bool
+\bool_new:N \l__chemformula_sup_bool
+\bool_new:N \l__chemformula_is_isotope_bool
+\bool_new:N \l__chemformula_xfrac_bool
+\bool_new:N \l__chemformula_nicefrac_bool
+\bool_new:N \l__chemformula_mathfrac_bool
+  \bool_set_true:N \l__chemformula_mathfrac_bool
+\bool_new:N \l__chemformula_fss_bool
+\bool_new:N \l__chemformula_fontspec_bool
+\bool_new:N \l__chemformula_fss_family_bool
+\bool_new:N \l__chemformula_fss_series_bool
+\bool_new:N \l__chemformula_fss_shape_bool
+\bool_new:N \l__chemformula_name_width_bool
+\bool_new:N \l__chemformula_charge_full_shift_bool
 
 % token lists:
-\tl_new:N \l_chemformula_chemformula_tmpa_tl
-\tl_new:N \g_chemformula_options_tl
-\tl_new:N \g_chemformula_output_tl
-\tl_new:N \l_chemformula_output_tl
-\tl_new:N \l_chemformula_input_tl
-\tl_new:N \l_chemformula_stoich_tl
-\tl_new:N \l_chemformula_decimal_output_tl
-  \tl_set:Nn \l_chemformula_decimal_output_tl { . }
-\tl_new:N \l_chemformula_font_family_tl
-  \tl_set_eq:NN \l_chemformula_font_family_tl \f@family
-\tl_new:N \l_chemformula_font_series_tl
-  \tl_set_eq:NN \l_chemformula_font_series_tl \f@series
-\tl_new:N \l_chemformula_font_shape_tl
-  \tl_set_eq:NN \l_chemformula_font_shape_tl \f@shape
-\tl_new:N \l_chemformula_format_tl
-\tl_new:N \l_chemformula_fontspec_options_tl
-\tl_new:N \l_chemformula_fontspec_argument_tl
-\tl_new:N \l_chemformula_name_format_tl
-  \tl_set:Nn \l_chemformula_name_format_tl { \scriptsize\centering }
+\tl_new:N \l__chemformula_chemformula_tmpa_tl
+\tl_new:N \g__chemformula_options_tl
+\tl_new:N \g__chemformula_output_tl
+\tl_new:N \l__chemformula_output_tl
+\tl_new:N \l__chemformula_input_tl
+\tl_new:N \l__chemformula_stoich_tl
+\tl_new:N \l__chemformula_decimal_output_tl
+  \tl_set:Nn \l__chemformula_decimal_output_tl { . }
+\tl_new:N \l__chemformula_font_family_tl
+  \tl_set_eq:NN \l__chemformula_font_family_tl \f@family
+\tl_new:N \l__chemformula_font_series_tl
+  \tl_set_eq:NN \l__chemformula_font_series_tl \f@series
+\tl_new:N \l__chemformula_font_shape_tl
+  \tl_set_eq:NN \l__chemformula_font_shape_tl \f@shape
+\tl_new:N \l__chemformula_format_tl
+\tl_new:N \l__chemformula_fontspec_options_tl
+\tl_new:N \l__chemformula_fontspec_argument_tl
+\tl_new:N \l__chemformula_name_format_tl
+  \tl_set:Nn \l__chemformula_name_format_tl { \scriptsize\centering }
 \tl_new:N \l_chemormula_sup_super_factor_tl
 
-\tl_new:N \l_chemformula_bond_style_tl
+\tl_new:N \l__chemformula_bond_style_tl
 
 % dimensions:
-\dim_new:N \l_chemformula_stoich_space_dim
-  \dim_set:Nn \l_chemformula_stoich_space_dim { .1667em }
-\dim_new:N \l_chemformula_math_space_dim
-  \dim_set:Nn \l_chemformula_math_space_dim { .1667em }
-\dim_new:N \l_chemformula_plus_space_dim
-  \dim_set:Nn \l_chemformula_plus_space_dim { .3em }
-\dim_new:N \l_chemformula_cdot_space_dim
-  \dim_set:Nn \l_chemformula_cdot_space_dim { .1333em }
-\dim_new:N \l_chemformula_charge_shift_dim
-  \dim_set:Nn \l_chemformula_charge_shift_dim { .5ex }
-\dim_new:N \l_chemformula_subscript_shift_default_dim
-  \dim_set:Nn \l_chemformula_subscript_shift_default_dim { -.65ex }
-\dim_new:N \l_chemformula_subscript_shift_dim
+\dim_new:N \l__chemformula_stoich_space_dim
+  \dim_set:Nn \l__chemformula_stoich_space_dim { .1667em }
+\dim_new:N \l__chemformula_math_space_dim
+  \dim_set:Nn \l__chemformula_math_space_dim { .1667em }
+\dim_new:N \l__chemformula_plus_space_dim
+  \dim_set:Nn \l__chemformula_plus_space_dim { .3em }
+\dim_new:N \l__chemformula_cdot_space_dim
+  \dim_set:Nn \l__chemformula_cdot_space_dim { .1333em }
+\dim_new:N \l__chemformula_charge_shift_dim
+  \dim_set:Nn \l__chemformula_charge_shift_dim { .5ex }
+\dim_new:N \l__chemformula_subscript_shift_default_dim
+  \dim_set:Nn \l__chemformula_subscript_shift_default_dim { -.65ex }
+\dim_new:N \l__chemformula_subscript_shift_dim
   \dim_set_eq:NN
-    \l_chemformula_subscript_shift_dim
-    \l_chemformula_subscript_shift_default_dim
-\dim_new:N \l_chemformula_subscript_shift_additional_dim
-\dim_new:N \l_chemformula_superscript_shift_default_dim
-  \dim_set:Nn \l_chemformula_superscript_shift_default_dim { .8ex }
-\dim_new:N \l_chemformula_superscript_shift_dim
+    \l__chemformula_subscript_shift_dim
+    \l__chemformula_subscript_shift_default_dim
+\dim_new:N \l__chemformula_subscript_shift_additional_dim
+\dim_new:N \l__chemformula_superscript_shift_default_dim
+  \dim_set:Nn \l__chemformula_superscript_shift_default_dim { .8ex }
+\dim_new:N \l__chemformula_superscript_shift_dim
   \dim_set_eq:NN
-    \l_chemformula_superscript_shift_dim
-    \l_chemformula_superscript_shift_default_dim
-\dim_new:N \l_chemformula_superscript_shift_additional_dim
-\dim_new:N \l_chemformula_subscript_dim
-  \dim_zero:N \l_chemformula_subscript_dim
-\dim_new:N \l_chemformula_superscript_dim
-  \dim_zero:N \l_chemformula_superscript_dim
-\dim_new:N \l_chemformula_bond_dim
-  \dim_set:Nn \l_chemformula_bond_dim { 1.1667ex }
+    \l__chemformula_superscript_shift_dim
+    \l__chemformula_superscript_shift_default_dim
+\dim_new:N \l__chemformula_superscript_shift_additional_dim
+\dim_new:N \l__chemformula_subscript_dim
+  \dim_zero:N \l__chemformula_subscript_dim
+\dim_new:N \l__chemformula_superscript_dim
+  \dim_zero:N \l__chemformula_superscript_dim
+\dim_new:N \l__chemformula_bond_dim
+  \dim_set:Nn \l__chemformula_bond_dim { 1.1667ex }
 
 % integers:
-\int_new:N \l_chemformula_count_tokens_int
+\int_new:N \l__chemformula_count_tokens_int
 
 % property lists:
 % behaviour in a compound
-\prop_new:N \l_chemformula_cmpd_prop
-\prop_put:Nnn \l_chemformula_cmpd_prop { 0 } { \chemformula_subscript:n { 0 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 1 } { \chemformula_subscript:n { 1 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 2 } { \chemformula_subscript:n { 2 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 3 } { \chemformula_subscript:n { 3 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 4 } { \chemformula_subscript:n { 4 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 5 } { \chemformula_subscript:n { 5 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 6 } { \chemformula_subscript:n { 6 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 7 } { \chemformula_subscript:n { 7 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 8 } { \chemformula_subscript:n { 8 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { 9 } { \chemformula_subscript:n { 9 } }
-\prop_put:Nnn \l_chemformula_cmpd_prop { * } { \chemformula_star_adduct: }
-\prop_put:Nnn \l_chemformula_cmpd_prop { . } { \chemformula_adduct: }
-\prop_put:Nnn \l_chemformula_cmpd_prop { - } { \chemformula_single_bond: }
-\prop_put:Nnn \l_chemformula_cmpd_prop { = } { \chemformula_double_bond: }
-\prop_put:Nnn \l_chemformula_cmpd_prop { + } { \chemformula_triple_bond: }
+\prop_new:N \l__chemformula_cmpd_prop
+\prop_put:Nnn \l__chemformula_cmpd_prop { 0 } { \chemformula_subscript:n { 0 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 1 } { \chemformula_subscript:n { 1 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 2 } { \chemformula_subscript:n { 2 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 3 } { \chemformula_subscript:n { 3 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 4 } { \chemformula_subscript:n { 4 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 5 } { \chemformula_subscript:n { 5 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 6 } { \chemformula_subscript:n { 6 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 7 } { \chemformula_subscript:n { 7 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 8 } { \chemformula_subscript:n { 8 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { 9 } { \chemformula_subscript:n { 9 } }
+\prop_put:Nnn \l__chemformula_cmpd_prop { * } { \chemformula_star_adduct: }
+\prop_put:Nnn \l__chemformula_cmpd_prop { . } { \chemformula_adduct: }
+\prop_put:Nnn \l__chemformula_cmpd_prop { - } { \chemformula_single_bond: }
+\prop_put:Nnn \l__chemformula_cmpd_prop { = } { \chemformula_double_bond: }
+\prop_put:Nnn \l__chemformula_cmpd_prop { + } { \chemformula_triple_bond: }
 
 % numbers
-\prop_new:N \l_chemformula_numbers_prop
-\prop_put:Nnn \l_chemformula_numbers_prop { 0 } { 0 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 1 } { 1 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 2 } { 2 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 3 } { 3 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 4 } { 4 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 5 } { 5 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 6 } { 6 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 7 } { 7 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 8 } { 8 }
-\prop_put:Nnn \l_chemformula_numbers_prop { 9 } { 9 }
+\prop_new:N \l__chemformula_numbers_prop
+\prop_put:Nnn \l__chemformula_numbers_prop { 0 } { 0 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 1 } { 1 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 2 } { 2 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 3 } { 3 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 4 } { 4 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 5 } { 5 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 6 } { 6 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 7 } { 7 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 8 } { 8 }
+\prop_put:Nnn \l__chemformula_numbers_prop { 9 } { 9 }
 
 % behaviour in a charge
-\prop_new:N \l_chemformula_charge_prop
-\prop_put:Nnn \l_chemformula_charge_prop { 0 }
+\prop_new:N \l__chemformula_charge_prop
+\prop_put:Nnn \l__chemformula_charge_prop { 0 }
   { \chemformula_charge_style:n { 0 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 1 }
+\prop_put:Nnn \l__chemformula_charge_prop { 1 }
   { \chemformula_charge_style:n { 1 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 2 }
+\prop_put:Nnn \l__chemformula_charge_prop { 2 }
   { \chemformula_charge_style:n { 2 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 3 }
+\prop_put:Nnn \l__chemformula_charge_prop { 3 }
   { \chemformula_charge_style:n { 3 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 4 }
+\prop_put:Nnn \l__chemformula_charge_prop { 4 }
   { \chemformula_charge_style:n { 4 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 5 }
+\prop_put:Nnn \l__chemformula_charge_prop { 5 }
   { \chemformula_charge_style:n { 5 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 6 }
+\prop_put:Nnn \l__chemformula_charge_prop { 6 }
   { \chemformula_charge_style:n { 6 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 7 }
+\prop_put:Nnn \l__chemformula_charge_prop { 7 }
   { \chemformula_charge_style:n { 7 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 8 }
+\prop_put:Nnn \l__chemformula_charge_prop { 8 }
   { \chemformula_charge_style:n { 8 } }
-\prop_put:Nnn \l_chemformula_charge_prop { 9 }
+\prop_put:Nnn \l__chemformula_charge_prop { 9 }
   { \chemformula_charge_style:n { 9 } }
-\prop_put:Nnn \l_chemformula_charge_prop { + } { \chemformula_plus: }
-\prop_put:Nnn \l_chemformula_charge_prop { - } { \chemformula_minus: }
-\prop_put:Nnn \l_chemformula_charge_prop { . } { \chemformula_radical: }
+\prop_put:Nnn \l__chemformula_charge_prop { + } { \chemformula_plus: }
+\prop_put:Nnn \l__chemformula_charge_prop { - } { \chemformula_minus: }
+\prop_put:Nnn \l__chemformula_charge_prop { . } { \chemformula_radical: }
 
 % stoichiometric factors
-\prop_new:N \l_chemformula_stoich_prop
-\prop_put:Nnn \l_chemformula_stoich_prop { 0 } { 0 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 1 } { 1 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 2 } { 2 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 3 } { 3 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 4 } { 4 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 5 } { 5 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 6 } { 6 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 7 } { 7 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 8 } { 8 }
-\prop_put:Nnn \l_chemformula_stoich_prop { 9 } { 9 }
-\prop_put:Nnn \l_chemformula_stoich_prop { . }
-  { { \l_chemformula_decimal_output_tl } }
-\prop_put:Nnn \l_chemformula_stoich_prop { , }
-  { { \l_chemformula_decimal_output_tl } }
-\prop_put:Nnn \l_chemformula_stoich_prop { / } { / }
-\prop_put:Nnn \l_chemformula_stoich_prop { _ } { _ }
-\prop_put:Nnn \l_chemformula_stoich_prop { ( } { ( }
-\prop_put:Nnn \l_chemformula_stoich_prop { ) } { ) }
+\prop_new:N \l__chemformula_stoich_prop
+\prop_put:Nnn \l__chemformula_stoich_prop { 0 } { 0 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 1 } { 1 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 2 } { 2 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 3 } { 3 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 4 } { 4 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 5 } { 5 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 6 } { 6 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 7 } { 7 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 8 } { 8 }
+\prop_put:Nnn \l__chemformula_stoich_prop { 9 } { 9 }
+\prop_put:Nnn \l__chemformula_stoich_prop { . }
+  { { \l__chemformula_decimal_output_tl } }
+\prop_put:Nnn \l__chemformula_stoich_prop { , }
+  { { \l__chemformula_decimal_output_tl } }
+\prop_put:Nnn \l__chemformula_stoich_prop { / } { / }
+\prop_put:Nnn \l__chemformula_stoich_prop { _ } { _ }
+\prop_put:Nnn \l__chemformula_stoich_prop { ( } { ( }
+\prop_put:Nnn \l__chemformula_stoich_prop { ) } { ) }
 
 %-----------------------------------------------------------------------------%
 % bonds:
-\dim_new:N  \l_chemformula_bond_space_dim
-\dim_set:Nn \l_chemformula_bond_space_dim { .07em }
-\prop_new:N \l_chemformula_bonds_prop
+\dim_new:N  \l__chemformula_bond_space_dim
+\dim_set:Nn \l__chemformula_bond_space_dim { .07em }
+\prop_new:N \l__chemformula_bonds_prop
 
-\cs_new:Npn \chemformula@bondlength { \l_chemformula_bond_dim }
+\cs_new:Npn \chemformula@bondlength { \l__chemformula_bond_dim }
 
 \cs_new:Npn \chemformula_single_bond:
   {
-    \bool_if:NTF \l_chemformula_sup_bool
+    \bool_if:NTF \l__chemformula_sup_bool
       { \chemformula_minus: }
       { \chemformula_bond:n { single } }
   }
@@ -910,7 +914,7 @@
 
 \cs_new:Npn \chemformula_bond:n #1
   {
-    \skip_horizontal:N \l_chemformula_bond_space_dim
+    \skip_horizontal:N \l__chemformula_bond_space_dim
     \chemformula_tikz:nn
       {
         inner~sep   = 0 ,
@@ -923,23 +927,23 @@
           (chemformula-bond-ground) at (0,0) {};
         \draw (chemformula-bond-ground) ++ (0,-.1716em)
           coordinate (chemformula-bond-start) ;
-        \draw (chemformula-bond-start) ++(\l_chemformula_bond_dim ,0)
+        \draw (chemformula-bond-start) ++(\l__chemformula_bond_dim ,0)
           coordinate (chemformula-bond-end) ;
         \tl_if_blank:nTF { #1 }
           { \chemformula_bond_draw:n { single } }
           { \chemformula_bond_draw:n { #1 } }
       }
-    \skip_horizontal:N \l_chemformula_bond_space_dim
+    \skip_horizontal:N \l__chemformula_bond_space_dim
   }
 
 \cs_new:Npn \chemformula_bond_draw:n #1
   {
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl {} { #1 }
-    \exp_args:NNo \prop_get:Nn \l_chemformula_bonds_prop
-      { \l_chemformula_tmpa_tl }
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl {} { #1 }
+    \exp_args:NNo \prop_get:Nn \l__chemformula_bonds_prop
+      { \l__chemformula_tmpa_tl }
   }
 
-\tikzset { chembond/.style={butt~cap-butt~cap,\l_chemformula_bond_style_tl} }
+\tikzset { chembond/.style={butt~cap-butt~cap,\l__chemformula_bond_style_tl} }
 
 \NewDocumentCommand \DeclareChemBond { mm }
   {
@@ -947,7 +951,7 @@
       { \chemmacros_msg:nnxx { chemformula } { declare-bond } { #1 } {} }
       {
         \cs_new:cpn { chemformula_bond_type_#1 } {}
-        \prop_put:Nnn \l_chemformula_bonds_prop { #1 } { #2 }
+        \prop_put:Nnn \l__chemformula_bonds_prop { #1 } { #2 }
       }
   }
 
@@ -957,22 +961,22 @@
       { \chemmacros_msg:nnxx { chemformula } { declare-bond } { #1 } {} }
       {
         \cs_new:cpn { chemformula_bond_type_#1 } {}
-        \prop_get:NnN \l_chemformula_bonds_prop { #2 } \l_chemformula_tmpa_tl
-        \prop_put:Nno \l_chemformula_bonds_prop { #1 } { \l_chemformula_tmpa_tl }
+        \prop_get:NnN \l__chemformula_bonds_prop { #2 } \l__chemformula_tmpa_tl
+        \prop_put:Nno \l__chemformula_bonds_prop { #1 } { \l__chemformula_tmpa_tl }
       }
   }
 
 \NewDocumentCommand \RenewChemBond { mm }
   {
     \cs_if_exist:cTF { chemformula_bond_type_#1 }
-      { \prop_put:Nnn \l_chemformula_bonds_prop { #1 } { #2 } }
+      { \prop_put:Nnn \l__chemformula_bonds_prop { #1 } { #2 } }
       { \chemmacros_msg:nnxx { chemformula } { renew-bond } { #1 } {} }
   }
 
 \NewDocumentCommand \ShowChemBond { m }
   {
-    \prop_get:NnN \l_chemformula_bonds_prop { #1 } \l_chemformula_tmpa_tl
-    \tl_to_str:N \l_chemformula_tmpa_tl
+    \prop_get:NnN \l__chemformula_bonds_prop { #1 } \l__chemformula_tmpa_tl
+    \tl_to_str:N \l__chemformula_tmpa_tl
   }
 
 \NewDocumentCommand \bond { m }
@@ -1051,22 +1055,22 @@
 % sub- and superscripts
 \cs_new:Npn \chemformula_number_style:n #1
   {
-    \bool_if:NTF \l_chemformula_number_style_math_bool
+    \bool_if:NTF \l__chemformula_number_style_math_bool
       { \ensuremath { #1 } }
       { \ensuremath { \text { #1 } } }
   }
 
 \cs_new:Npn \chemformula_charge_style:n #1
   {
-    \bool_if:NTF \l_chemformula_charge_style_math_bool
+    \bool_if:NTF \l__chemformula_charge_style_math_bool
       { \ensuremath { #1 } }
       { \ensuremath { \text { #1 } } }
   }
 \cs_generate_variant:Nn \chemformula_charge_style:n { V }
 
 % subscripts
-\tl_new:N \l_chemformula_subscript_tl
-\box_new:N \l_chemformula_subscript_box
+\tl_new:N \l__chemformula_subscript_tl
+\box_new:N \l__chemformula_subscript_box
 
 % remove double or nested sub- and superscripts
 \cs_new:Npn \chemformula_subscript:n #1
@@ -1077,12 +1081,12 @@
         \tl_if_eq:nnTF { #1 }{ \chemformula_subscript:n }
           { \chemformula_subscript_aux:n }
           {
-            \tl_set:Nn \l_chemformula_tmpc_tl { #1 }
+            \tl_set:Nn \l__chemformula_tmpc_tl { #1 }
             \tl_if_in:nnT { #1 } { \chemformula_subscript:n }
-              { \tl_remove_all:Nn \l_chemformula_tmpc_tl { \chemformula_subscript:n } }
+              { \tl_remove_all:Nn \l__chemformula_tmpc_tl { \chemformula_subscript:n } }
             \tl_if_in:nnT { #1 } { \chemformula_superscript:n }
-              { \tl_remove_all:Nn \l_chemformula_tmpc_tl { \chemformula_superscript:n } }
-            \chemformula_subscript_aux:V \l_chemformula_tmpc_tl
+              { \tl_remove_all:Nn \l__chemformula_tmpc_tl { \chemformula_superscript:n } }
+            \chemformula_subscript_aux:V \l__chemformula_tmpc_tl
           }
       }
   }
@@ -1090,7 +1094,7 @@
 % handle subscripts
 \cs_new:Npn \chemformula_subscript_aux:n #1
   {
-    \tl_put_right:Nn \l_chemformula_subscript_tl { #1 }
+    \tl_put_right:Nn \l__chemformula_subscript_tl { #1 }
     \chemformula_clean_subscript:
     % if a subscript follows just store and do nothing else
     \peek_meaning:NF \chemformula_subscript:n
@@ -1099,8 +1103,8 @@
         % if something else follows both sub- and superscript
         \peek_meaning:NF \chemformula_superscript:n
           {
-            \chemformula_measure_subscript:V \l_chemformula_subscript_tl
-            \chemformula_measure_superscript:V \l_chemformula_superscript_tl
+            \chemformula_measure_subscript:V \l__chemformula_subscript_tl
+            \chemformula_measure_superscript:V \l__chemformula_superscript_tl
             \chemformula_use_sub_and_superscript:
           }
       }
@@ -1109,25 +1113,25 @@
 
 \cs_new:Npn \chemformula_clean_subscript:
   {
-    \tl_replace_all:Nnn \l_chemformula_subscript_tl
+    \tl_replace_all:Nnn \l__chemformula_subscript_tl
       { \chemformula_single_bond: } { \chemformula_minus: }
-    \tl_replace_all:Nnn \l_chemformula_subscript_tl
+    \tl_replace_all:Nnn \l__chemformula_subscript_tl
       { \chemformula_triple_bond: } {\chemformula_plus: }
-    \tl_replace_all:Nnn \l_chemformula_subscript_tl
+    \tl_replace_all:Nnn \l__chemformula_subscript_tl
       { \chemformula_adduct: } { . }
-    \tl_replace_all:Nnn \l_chemformula_subscript_tl
+    \tl_replace_all:Nnn \l__chemformula_subscript_tl
       { \chemformula_star_adduct: } { * }
   }
 
 \cs_new:Npn \chemformula_subscript_write:n #1
   {
-    \tex_raise:D \l_chemformula_subscript_shift_dim
+    \tex_raise:D \l__chemformula_subscript_shift_dim
     \hbox:n
       {
         $\scriptstyle
-        \prop_get:NoNTF \l_chemformula_numbers_prop
-          { #1 } \l_chemformula_tmpa_tl
-          { \chemformula_number_style:n { \l_chemformula_tmpa_tl } }
+        \prop_get:NoNTF \l__chemformula_numbers_prop
+          { #1 } \l__chemformula_tmpa_tl
+          { \chemformula_number_style:n { \l__chemformula_tmpa_tl } }
           { \chemformula_number_style:n { #1 } }$
       }
   }
@@ -1135,16 +1139,16 @@
 
 \cs_new:Npn \chemformula_measure_subscript:n #1
   {
-    \hbox_set:Nn \l_chemformula_tmpa_box
+    \hbox_set:Nn \l__chemformula_tmpa_box
       { \chemformula_subscript_write:n { #1 } }
-    \dim_set:Nn \l_chemformula_subscript_dim { -\box_wd:N \l_chemformula_tmpa_box }
-    \box_clear:N \l_chemformula_tmpa_box
+    \dim_set:Nn \l__chemformula_subscript_dim { -\box_wd:N \l__chemformula_tmpa_box }
+    \box_clear:N \l__chemformula_tmpa_box
   }
 \cs_generate_variant:Nn \chemformula_measure_subscript:n { V }
 
 % superscripts
-\tl_new:N \l_chemformula_superscript_tl
-\box_new:N \l_chemformula_superscript_box
+\tl_new:N \l__chemformula_superscript_tl
+\box_new:N \l__chemformula_superscript_box
 
 % remove double or nested sub- and superscripts
 \cs_new:Npn \chemformula_superscript:n #1
@@ -1155,12 +1159,12 @@
         \tl_if_eq:nnTF { #1 } { \chemformula_subscript:n }
           { \chemformula_superscript_aux:n }
           {
-            \tl_set:Nn \l_chemformula_tmpc_tl { #1 }
+            \tl_set:Nn \l__chemformula_tmpc_tl { #1 }
             \tl_if_in:nnT { #1 } { \chemformula_subscript:n }
-              { \tl_remove_all:Nn \l_chemformula_tmpc_tl { \chemformula_subscript:n } }
+              { \tl_remove_all:Nn \l__chemformula_tmpc_tl { \chemformula_subscript:n } }
             \tl_if_in:nnT { #1 } { \chemformula_superscript:n }
-              { \tl_remove_all:Nn \l_chemformula_tmpc_tl { \chemformula_superscript:n } }
-            \chemformula_superscript_aux:V \l_chemformula_tmpc_tl
+              { \tl_remove_all:Nn \l__chemformula_tmpc_tl { \chemformula_superscript:n } }
+            \chemformula_superscript_aux:V \l__chemformula_tmpc_tl
           }
       }
   }
@@ -1168,14 +1172,14 @@
 % handle superscripts
 \cs_new:Npn \chemformula_superscript_aux:n #1
   {
-    \tl_put_right:Nn \l_chemformula_superscript_tl { #1 }
+    \tl_put_right:Nn \l__chemformula_superscript_tl { #1 }
     \chemformula_clean_superscript:
     \peek_meaning:NF \chemformula_superscript:n
       {
         \peek_meaning:NF \chemformula_subscript:n
           {
-            \chemformula_measure_subscript:V \l_chemformula_subscript_tl
-            \chemformula_measure_superscript:V \l_chemformula_superscript_tl
+            \chemformula_measure_subscript:V \l__chemformula_subscript_tl
+            \chemformula_measure_superscript:V \l__chemformula_superscript_tl
             \chemformula_use_sub_and_superscript:
           }
       }
@@ -1184,31 +1188,31 @@
 
 \cs_new:Npn \chemformula_clean_superscript:
   {
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { \chemformula_single_bond: } { \chemformula_minus: }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { - } { \chemformula_minus: }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { \chemformula_triple_bond: } { \chemformula_plus: }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { + } { \chemformula_plus: }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { \chemformula_adduct: } { \chemformula_radical: }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { \chemformula_star_adduct: } { * }
-    \tl_replace_all:Nnn \l_chemformula_superscript_tl
+    \tl_replace_all:Nnn \l__chemformula_superscript_tl
       { . } { \chemformula_radical: }
   }
 
 \cs_new:Npn \chemformula_superscript_write:n #1
   {
-    \tex_raise:D \l_chemformula_superscript_shift_dim
+    \tex_raise:D \l__chemformula_superscript_shift_dim
     \hbox:n
       {
         $\scriptstyle
-        \prop_get:NoNTF \l_chemformula_charge_prop
-          { #1 } \l_chemformula_tmpa_tl
-          { \chemformula_charge_style:V \l_chemformula_tmpa_tl }
+        \prop_get:NoNTF \l__chemformula_charge_prop
+          { #1 } \l__chemformula_tmpa_tl
+          { \chemformula_charge_style:V \l__chemformula_tmpa_tl }
           { \chemformula_charge_style:n { #1 } }$
       }
   }
@@ -1216,11 +1220,11 @@
 
 \cs_new:Npn \chemformula_measure_superscript:n #1
   {
-    \hbox_set:Nn \l_chemformula_tmpa_box
+    \hbox_set:Nn \l__chemformula_tmpa_box
       { \chemformula_superscript_write:n { #1 } }
-    \dim_set:Nn \l_chemformula_superscript_dim
-      { -\box_wd:N \l_chemformula_tmpa_box }
-    \box_clear:N \l_chemformula_tmpa_box
+    \dim_set:Nn \l__chemformula_superscript_dim
+      { -\box_wd:N \l__chemformula_tmpa_box }
+    \box_clear:N \l__chemformula_tmpa_box
   }
 \cs_generate_variant:Nn \chemformula_measure_superscript:n { V }
 
@@ -1229,96 +1233,96 @@
   {
     \group_begin:
     % No shift for excited state
-    \exp_args:No \tl_if_eq:nnT { \l_chemformula_superscript_tl } { * }
+    \exp_args:No \tl_if_eq:nnT { \l__chemformula_superscript_tl } { * }
       {
-        \bool_set_false:N \l_chemformula_charge_full_shift_bool
-        \dim_zero:N \l_chemformula_charge_shift_dim
+        \bool_set_false:N \l__chemformula_charge_full_shift_bool
+        \dim_zero:N \l__chemformula_charge_shift_dim
       }
     % align to the right if isotope else to the left
-    \bool_if:NTF \l_chemformula_is_isotope_bool
+    \bool_if:NTF \l__chemformula_is_isotope_bool
       {
-        \tl_if_blank:VF \l_chemformula_superscript_tl
+        \tl_if_blank:VF \l__chemformula_superscript_tl
           {
             \dim_compare:nT
-              { \l_chemformula_subscript_dim < \l_chemformula_superscript_dim }
+              { \l__chemformula_subscript_dim < \l__chemformula_superscript_dim }
               {
-                \skip_horizontal:n { -\l_chemformula_subscript_dim }
-                \skip_horizontal:N \l_chemformula_superscript_dim
+                \skip_horizontal:n { -\l__chemformula_subscript_dim }
+                \skip_horizontal:N \l__chemformula_superscript_dim
               }
           }
       }
       {
         % add hshift to the superscript if there also is a subscript
-        \tl_if_blank:VF \l_chemformula_superscript_tl
+        \tl_if_blank:VF \l__chemformula_superscript_tl
           {
-            \tl_if_blank:VF \l_chemformula_subscript_tl
+            \tl_if_blank:VF \l__chemformula_subscript_tl
               {
-                \bool_if:NTF \l_chemformula_charge_full_shift_bool
-                  { \skip_horizontal:n { -\l_chemformula_subscript_dim } }
-                  { \skip_horizontal:N \l_chemformula_charge_shift_dim }
+                \bool_if:NTF \l__chemformula_charge_full_shift_bool
+                  { \skip_horizontal:n { -\l__chemformula_subscript_dim } }
+                  { \skip_horizontal:N \l__chemformula_charge_shift_dim }
               }
           }
       }
     % typeset superscript
-    \tl_if_blank:VF \l_chemformula_superscript_tl
+    \tl_if_blank:VF \l__chemformula_superscript_tl
       {
-       \chemformula_superscript_write:V \l_chemformula_superscript_tl
+       \chemformula_superscript_write:V \l__chemformula_superscript_tl
         % skip back for the subscript
-        \tl_if_blank:VF \l_chemformula_subscript_tl
+        \tl_if_blank:VF \l__chemformula_subscript_tl
           {
-            \bool_if:NTF \l_chemformula_is_isotope_bool
-              { \skip_horizontal:N \l_chemformula_subscript_dim }
+            \bool_if:NTF \l__chemformula_is_isotope_bool
+              { \skip_horizontal:N \l__chemformula_subscript_dim }
               {
-                \skip_horizontal:N \l_chemformula_superscript_dim
-                    \bool_if:NTF \l_chemformula_charge_full_shift_bool
-                      { \skip_horizontal:N \l_chemformula_subscript_dim }
+                \skip_horizontal:N \l__chemformula_superscript_dim
+                    \bool_if:NTF \l__chemformula_charge_full_shift_bool
+                      { \skip_horizontal:N \l__chemformula_subscript_dim }
                       {
                         \skip_horizontal:n
-                          { -\l_chemformula_charge_shift_dim }
+                          { -\l__chemformula_charge_shift_dim }
                       }
               }
           }
       }
     % typeset subscript
-    \tl_if_blank:VF \l_chemformula_subscript_tl
-      { \chemformula_subscript_write:V \l_chemformula_subscript_tl }
-    \bool_if:NF \l_chemformula_is_isotope_bool
+    \tl_if_blank:VF \l__chemformula_subscript_tl
+      { \chemformula_subscript_write:V \l__chemformula_subscript_tl }
+    \bool_if:NF \l__chemformula_is_isotope_bool
       {
-        \dim_zero:N \l_chemformula_tmpa_dim
-        \bool_if:NTF \l_chemformula_charge_full_shift_bool
+        \dim_zero:N \l__chemformula_tmpa_dim
+        \bool_if:NTF \l__chemformula_charge_full_shift_bool
           {
-            \tl_if_blank:VF \l_chemformula_subscript_tl
-              { \dim_set:Nn \l_chemformula_tmpa_dim { - \l_chemformula_superscript_dim } }
+            \tl_if_blank:VF \l__chemformula_subscript_tl
+              { \dim_set:Nn \l__chemformula_tmpa_dim { - \l__chemformula_superscript_dim } }
           }
           {
-            \tl_if_blank:VF \l_chemformula_superscript_tl
+            \tl_if_blank:VF \l__chemformula_superscript_tl
               {
-                \tl_if_blank:VF \l_chemformula_subscript_tl
+                \tl_if_blank:VF \l__chemformula_subscript_tl
                   {
-                    \dim_set:Nn \l_chemformula_tmpa_dim
+                    \dim_set:Nn \l__chemformula_tmpa_dim
                       {
-                        \l_chemformula_charge_shift_dim
-                        - \l_chemformula_superscript_dim
-                        + \l_chemformula_subscript_dim
+                        \l__chemformula_charge_shift_dim
+                        - \l__chemformula_superscript_dim
+                        + \l__chemformula_subscript_dim
                       }
                   }
               }
           }
-        \dim_compare:nT { \l_chemformula_tmpa_dim > 0pt }
-          { \skip_horizontal:N \l_chemformula_tmpa_dim }
+        \dim_compare:nT { \l__chemformula_tmpa_dim > 0pt }
+          { \skip_horizontal:N \l__chemformula_tmpa_dim }
       }
     \group_end:
     % clean up
-    \bool_set_false:N \l_chemformula_is_isotope_bool
-    \tl_clear:N \l_chemformula_subscript_tl
-    \tl_clear:N \l_chemformula_superscript_tl
+    \bool_set_false:N \l__chemformula_is_isotope_bool
+    \tl_clear:N \l__chemformula_subscript_tl
+    \tl_clear:N \l__chemformula_superscript_tl
   }
 
 %-----------------------------------------------------------------------------%
 % read the input
 \cs_new:Npn \chemformula_input:n #1
   {
-    \tl_set_rescan:Nnn \l_chemformula_chemformula_tmpa_tl
+    \tl_set_rescan:Nnn \l__chemformula_chemformula_tmpa_tl
       {
         \char_set_catcode_letter:N \{
         \char_set_catcode_letter:N \}
@@ -1326,12 +1330,12 @@
         \char_set_catcode_other:N \"
       }
       { #1 }
-    \chemformula_input_escape_text:o { \l_chemformula_chemformula_tmpa_tl }
+    \chemformula_input_escape_text:V \l__chemformula_chemformula_tmpa_tl
     \chemformula_input_escape_math:n { #1 }
     \chemformula_input_stoich:n { #1 }
-    \chemformula_clean_chem_macros:o { \l_chemformula_chemformula_tmpa_tl }
+    \chemformula_clean_chem_macros:V \l__chemformula_chemformula_tmpa_tl
     \chemformula_input_cmpd:VN
-      \l_chemformula_chemformula_tmpa_tl \l_chemformula_input_tl
+      \l__chemformula_chemformula_tmpa_tl \l__chemformula_input_tl
     \chemformula_input_arrow:n { #1 }
     \chemformula_input_name:n { #1 }
     \chemformula_input_plus:n { #1 }
@@ -1344,45 +1348,45 @@
 \cs_new:Npn \chemformula_input_options:n #1
   {
     \makeatother
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl { \makeatletter } { #1 }
-    \tl_if_in:VnTF \l_chemformula_tmpa_tl { @ }
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl { \makeatletter } { #1 }
+    \tl_if_in:VnTF \l__chemformula_tmpa_tl { @ }
       {
-        \bool_set_true:N \l_chemformula_options_bool
-        \bool_set_true:N \l_chemformula_is_option_bool
-        \tl_remove_all:Nn \l_chemformula_tmpa_tl { @ }
-        \exp_last_unbraced:Nno \tl_set:Nn \l_chemformula_internal_options_tl
-          { \l_chemformula_tmpa_tl }
+        \bool_set_true:N \l__chemformula_options_bool
+        \bool_set_true:N \l__chemformula_is_option_bool
+        \tl_remove_all:Nn \l__chemformula_tmpa_tl { @ }
+        \exp_last_unbraced:Nno \tl_set:Nn \l__chemformula_internal_options_tl
+          { \l__chemformula_tmpa_tl }
       }
-      { \bool_set_false:N \l_chemformula_is_option_bool }
+      { \bool_set_false:N \l__chemformula_is_option_bool }
   }
 
 %-----------------------------------------------------------------------------%
 % input stoichiometric factors
 \cs_new:Npn \chemformula_input_stoich:n #1
   {
-    \bool_set_true:N \l_chemformula_stoich_bool
-    \tl_put_right:Nn \l_chemformula_stoich_tl { \chemformula_font_inner: }
+    \bool_set_true:N \l__chemformula_stoich_bool
+    \tl_put_right:Nn \l__chemformula_stoich_tl { \chemformula_font_inner: }
     \tl_map_inline:nn { #1 }
       {
-        \prop_get:NnNTF  \l_chemformula_stoich_prop { ##1 } \l_chemformula_tmpa_tl
+        \prop_get:NnNTF  \l__chemformula_stoich_prop { ##1 } \l__chemformula_tmpa_tl
           {
-            \bool_if:NT \l_chemformula_stoich_bool
-              { \tl_put_right:Nx \l_chemformula_stoich_tl { \l_chemformula_tmpa_tl } }
+            \bool_if:NT \l__chemformula_stoich_bool
+              { \tl_put_right:Nx \l__chemformula_stoich_tl { \l__chemformula_tmpa_tl } }
           }
-          { \bool_set_false:N \l_chemformula_stoich_bool }
+          { \bool_set_false:N \l__chemformula_stoich_bool }
       }
-    \bool_if:NTF \l_chemformula_stoich_bool
+    \bool_if:NTF \l__chemformula_stoich_bool
       {
-        \tl_if_blank:VF \l_chemformula_stoich_tl
+        \tl_if_blank:VF \l__chemformula_stoich_tl
           {
-            \tl_set_rescan:Nno \l_chemformula_stoich_tl
+            \tl_set_rescan:Nno \l__chemformula_stoich_tl
               { \ExplSyntaxOn }
-              { \l_chemformula_stoich_tl }
+              { \l__chemformula_stoich_tl }
             \exp_args:No \chemformula_parse_stoich:n
-              { \l_chemformula_stoich_tl }
+              { \l__chemformula_stoich_tl }
           }
       }
-      { \tl_clear:N \l_chemformula_stoich_tl }
+      { \tl_clear:N \l__chemformula_stoich_tl }
   }
 
 \cs_new:Npn \chemformula_bm:n #1 { #1 }
@@ -1391,14 +1395,14 @@
   {
     % TODO add support for missing leading 0
     \tl_if_in:nnTF { #1 } { ( }
-      { \tl_put_right:Nn \l_chemformula_input_tl { #1 } }
+      { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
       {
         \tl_if_in:nnTF { #1 } { _ }
           { \chemformula_parse_stoich_misc_frac:w #1 \q_nil }
           {
             \tl_if_in:nnTF { #1 } { / }
               { \chemformula_parse_stoich_frac:w #1 \q_nil }
-              { \tl_put_right:Nn \l_chemformula_input_tl { #1 } }
+              { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
           }
       }
   }
@@ -1411,33 +1415,33 @@
 
 \cs_new:Npn \chemformula_parse_stoich_frac:w #1/#2 \q_nil
   {
-    \tl_put_right:Nn \l_chemformula_input_tl
+    \tl_put_right:Nn \l__chemformula_input_tl
       { \chemformula_frac:nn { #1 } { #2 } }
   }
 
 \cs_new:Npn \chemformula_parse_stoich_misc_frac:w #1_#2/#3 \q_nil
   {
-    \tl_put_right:Nn \l_chemformula_input_tl
+    \tl_put_right:Nn \l__chemformula_input_tl
       { \chemformula_misc_frac:nnn { #1 } { #2 } { #3 } }
   }
 
 \cs_new:Npn \chemformula_frac:nn #1#2
   {
-    \bool_if:NT \l_chemformula_xfrac_bool
+    \bool_if:NT \l__chemformula_xfrac_bool
       { \sfrac[chemformula-text-frac]{#1}{#2} }
-    \bool_if:NT \l_chemformula_nicefrac_bool
+    \bool_if:NT \l__chemformula_nicefrac_bool
       { \nicefrac{#1}{#2} }
-    \bool_if:NT \l_chemformula_mathfrac_bool
+    \bool_if:NT \l__chemformula_mathfrac_bool
       { $ \frac{ \text { #1 } } { \text { #2 } } $ }
   }
 
 \cs_new:Npn \chemformula_misc_frac:nnn #1#2#3
   {
-    \bool_if:NT \l_chemformula_xfrac_bool
+    \bool_if:NT \l__chemformula_xfrac_bool
       { #1\sfrac[chemformula-text-frac]{#2}{#3} }
-    \bool_if:NT \l_chemformula_nicefrac_bool
+    \bool_if:NT \l__chemformula_nicefrac_bool
       { #1\nicefrac{#2}{#3} }
-    \bool_if:NT \l_chemformula_mathfrac_bool
+    \bool_if:NT \l__chemformula_mathfrac_bool
       { #1 $ \frac{ \text { #2 } } { \text { #3 } } $ }
   }
 
@@ -1445,75 +1449,75 @@
 % input compounds
 \cs_new:Npn \chemformula_input_cmpd:nN #1#2
   {
-    \tl_if_blank:VTF \l_chemformula_stoich_tl
+    \tl_if_blank:VTF \l__chemformula_stoich_tl
       {
         \tl_if_eq:nnT { #1 } { + }
-          { \bool_set_true:N \l_chemformula_is_plus_bool }
+          { \bool_set_true:N \l__chemformula_is_plus_bool }
         \tl_if_eq:nnT { #1 } { v }
-          { \bool_set_true:N \l_chemformula_is_down_bool }
+          { \bool_set_true:N \l__chemformula_is_down_bool }
         \tl_if_eq:nnT { #1 } { ^ }
-          { \bool_set_true:N \l_chemformula_is_up_bool }
+          { \bool_set_true:N \l__chemformula_is_up_bool }
         \chemformula_detect_arrows:n { #1 }
         \chemformula_detect_name:n { #1 }
         \chemformula_input_options:n { #1 }
-        \bool_if:NT \l_chemformula_is_option_bool
+        \bool_if:NT \l__chemformula_is_option_bool
           {
             \tl_put_right:Nn #2
               {
                 \group_begin:
                   \keys_set:nV { chemmacros / chemformula }
-                    \l_chemformula_internal_options_tl
+                    \l__chemformula_internal_options_tl
               }
           }
         \bool_if:nT
           {
-            !\l_chemformula_is_option_bool &&
-            !\l_chemformula_is_plus_bool &&
-            !\l_chemformula_is_down_bool &&
-            !\l_chemformula_is_up_bool &&
-            !\l_chemformula_is_arrow_bool &&
-            !\l_chemformula_is_name_bool &&
-            !\l_chemformula_first_last_text_bool &&
-            !\l_chemformula_first_last_math_bool
+            !\l__chemformula_is_option_bool &&
+            !\l__chemformula_is_plus_bool &&
+            !\l__chemformula_is_down_bool &&
+            !\l__chemformula_is_up_bool &&
+            !\l__chemformula_is_arrow_bool &&
+            !\l__chemformula_is_name_bool &&
+            !\l__chemformula_first_last_text_bool &&
+            !\l__chemformula_first_last_math_bool
           }
           {
             \tl_put_right:Nn #2
               { \chemformula_font_inner: }
             \chemformula_handle_sub_and_superscripts:nN { #1 } #2
-            \bool_if:NT \l_chemformula_options_bool
+            \bool_if:NT \l__chemformula_options_bool
               {
                 \tl_put_right:Nn #2
                   {
                     \group_end:
-                    \tl_clear:N \l_chemformula_internal_options_tl
+                    \tl_clear:N \l__chemformula_internal_options_tl
                   }
-                \bool_set_false:N \l_chemformula_options_bool
+                \bool_set_false:N \l__chemformula_options_bool
               }
           }
       }
       {
         \tl_put_right:Nn #2
-          { \skip_horizontal:N \l_chemformula_stoich_space_dim }
-        \tl_clear:N \l_chemformula_stoich_tl
+          { \skip_horizontal:N \l__chemformula_stoich_space_dim }
+        \tl_clear:N \l__chemformula_stoich_tl
       }
   }
 \cs_generate_variant:Nn \chemformula_input_cmpd:nN { VN }
 
 \cs_new:Npn \chemformula_font_inner:
   {
-    \bool_if:NT \l_chemformula_fss_bool
+    \bool_if:NT \l__chemformula_fss_bool
       {
-        \bool_if:NT \l_chemformula_fss_family_bool
-          { \fontfamily { \l_chemformula_font_family_tl } }
-        \bool_if:NT \l_chemformula_fss_series_bool
-          { \fontseries { \l_chemformula_font_series_tl } }
-        \bool_if:NT \l_chemformula_fss_shape_bool
-          { \fontshape { \l_chemformula_font_shape_tl } }
+        \bool_if:NT \l__chemformula_fss_family_bool
+          { \fontfamily { \l__chemformula_font_family_tl } }
+        \bool_if:NT \l__chemformula_fss_series_bool
+          { \fontseries { \l__chemformula_font_series_tl } }
+        \bool_if:NT \l__chemformula_fss_shape_bool
+          { \fontshape { \l__chemformula_font_shape_tl } }
         \selectfont
       }
-    \bool_if:NT \l_chemformula_fontspec_bool
+    \bool_if:NT \l__chemformula_fontspec_bool
       { \chemformula_font: }
-    \tl_use:N \l_chemformula_format_tl
+    \tl_use:N \l__chemformula_format_tl
     \exp_args:No \tl_if_eq:nnTF { \f@series } { bx }
       { \cs_set_eq:NN \chemformula_bm:n \bm }
       { \cs_set:Nn \chemformula_bm:n { ##1 } }
@@ -1530,9 +1534,10 @@
 \cs_new:Npn \chemformula_fontspec_aux:w [#1]#2 \q_stop
   { \newfontfamily \chemformula_font: [ #1 ] { #2 } }
 
+
 \cs_new:Npn \chemformula_handle_sub_and_superscripts:nN #1#2
   {
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl
       {
         \char_set_catcode_letter:N \_
         \char_set_catcode_letter:N \{
@@ -1542,29 +1547,38 @@
       }
       { #1 }
     % let's see if the compound starts with a sub- or superscript:
-    \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_chemformula_tmpa_tl } { ^ }
-      { \bool_set_true:N \l_chemformula_is_isotope_bool }
-    \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l_chemformula_tmpa_tl } { _ }
-      { \bool_set_true:N \l_chemformula_is_isotope_bool }
-    \exp_args:NNx \prop_if_in:NnT \l_chemformula_numbers_prop
-      { \tl_head:V \l_chemformula_tmpa_tl }
-      { \bool_set_true:N \l_chemformula_is_isotope_bool }
-    \tl_if_in:VnT \l_chemformula_tmpa_tl { ^ }
+    \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l__chemformula_tmpa_tl } { ^ }
+      {
+        \tl_put_left:Nn \l__chemformula_tmpa_tl
+          { \bool_set_true:N \l__chemformula_is_isotope_bool }
+      }
+    \exp_args:Nx \tl_if_in:nnT { \tl_head:V \l__chemformula_tmpa_tl } { _ }
+      {
+        \tl_put_left:Nn \l__chemformula_tmpa_tl
+          { \bool_set_true:N \l__chemformula_is_isotope_bool }
+      }
+    \exp_args:NNx \prop_if_in:NnT \l__chemformula_numbers_prop
+      { \tl_head:V \l__chemformula_tmpa_tl }
+      {
+        \tl_put_left:Nn \l__chemformula_tmpa_tl
+          { \bool_set_true:N \l__chemformula_is_isotope_bool }
+      }
+    \tl_if_in:VnT \l__chemformula_tmpa_tl { ^ }
       {
-        \tl_replace_all:Nnn \l_chemformula_tmpa_tl { ^ }
+        \tl_replace_all:Nnn \l__chemformula_tmpa_tl { ^ }
           { \chemformula_superscript:n }
       }
-    \tl_if_in:VnT \l_chemformula_tmpa_tl { _ }
+    \tl_if_in:VnT \l__chemformula_tmpa_tl { _ }
       {
-        \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ }
+        \tl_replace_all:Nnn \l__chemformula_tmpa_tl { _ }
           { \chemformula_subscript:n }
       }
-    \int_zero:N \l_chemformula_count_tokens_int
-    \tl_map_inline:Nn \l_chemformula_tmpa_tl
+    \int_zero:N \l__chemformula_count_tokens_int
+    \tl_map_inline:Nn \l__chemformula_tmpa_tl
       {
-        \int_incr:N \l_chemformula_count_tokens_int
+        \int_incr:N \l__chemformula_count_tokens_int
         \int_compare:nTF
-          { \l_chemformula_count_tokens_int = \tl_length:N \l_chemformula_tmpa_tl }
+          { \l__chemformula_count_tokens_int = \tl_count:N \l__chemformula_tmpa_tl }
           {
             \tl_if_eq:nnTF { ##1 } { + }
               {
@@ -1578,15 +1592,15 @@
                       { \chemformula_superscript:n { \chemformula_minus: } }
                   }
                   {
-                    \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_chemformula_tmpb_tl
-                      { \tl_put_right:No #2 { \l_chemformula_tmpb_tl } }
+                    \prop_get:NnNTF \l__chemformula_cmpd_prop { ##1 } \l__chemformula_tmpb_tl
+                      { \tl_put_right:No #2 { \l__chemformula_tmpb_tl } }
                       { \tl_put_right:Nn #2 { ##1 } }
                   }
               }
           }
           {
-            \prop_get:NnNTF \l_chemformula_cmpd_prop { ##1 } \l_chemformula_tmpb_tl
-              { \tl_put_right:No #2 { \l_chemformula_tmpb_tl } }
+            \prop_get:NnNTF \l__chemformula_cmpd_prop { ##1 } \l__chemformula_tmpb_tl
+              { \tl_put_right:No #2 { \l__chemformula_tmpb_tl } }
               { \tl_put_right:Nn #2 { ##1 } }
           }
       }
@@ -1604,7 +1618,7 @@
       }
     \cs_set:Npn \chemmacros_xspace: {}
   }
-\cs_generate_variant:Nn \chemformula_clean_chem_macros:n { o }
+\cs_generate_variant:Nn \chemformula_clean_chem_macros:n { V }
 
 %-----------------------------------------------------------------------------%
 % input "and" sign
@@ -1612,14 +1626,14 @@
   {
     \tl_if_eq:nnT { #1 } { + }
       {
-        \tl_put_right:Nn \l_chemformula_input_tl
+        \tl_put_right:Nn \l__chemformula_input_tl
           {
-            \skip_horizontal:N \l_chemformula_plus_space_dim
+            \skip_horizontal:N \l__chemformula_plus_space_dim
             +
-            \skip_horizontal:N \l_chemformula_plus_space_dim
+            \skip_horizontal:N \l__chemformula_plus_space_dim
           }
       }
-    \bool_set_false:N \l_chemformula_is_plus_bool
+    \bool_set_false:N \l__chemformula_is_plus_bool
   }
 
 %-----------------------------------------------------------------------------%
@@ -1627,8 +1641,8 @@
 \cs_new:Npn \chemformula_input_up:n #1
   {
     \tl_if_eq:nnT { #1 } { ^ }
-      { \tl_put_right:Nn \l_chemformula_input_tl { $\uparrow$ } }
-    \bool_set_false:N \l_chemformula_is_up_bool
+      { \tl_put_right:Nn \l__chemformula_input_tl { $\uparrow$ } }
+    \bool_set_false:N \l__chemformula_is_up_bool
   }
 
 %-----------------------------------------------------------------------------%
@@ -1636,8 +1650,8 @@
 \cs_new:Npn \chemformula_input_down:n #1
   {
     \tl_if_eq:nnT { #1 } { v }
-      { \tl_put_right:Nn \l_chemformula_input_tl { $\downarrow$ } }
-    \bool_set_false:N \l_chemformula_is_down_bool
+      { \tl_put_right:Nn \l__chemformula_input_tl { $\downarrow$ } }
+    \bool_set_false:N \l__chemformula_is_down_bool
   }
 
 %-----------------------------------------------------------------------------%
@@ -1646,12 +1660,12 @@
   {
     \bool_if:nT
       {
-        \l_chemformula_is_arrow_bool &&
-        !\l_chemformula_first_last_text_bool &&
-        !\l_chemformula_first_last_math_bool
+        \l__chemformula_is_arrow_bool &&
+        !\l__chemformula_first_last_text_bool &&
+        !\l__chemformula_first_last_math_bool
       }
-      { \tl_put_right:Nn \l_chemformula_input_tl { #1 } }
-    \bool_set_false:N \l_chemformula_is_arrow_bool
+      { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
+    \bool_set_false:N \l__chemformula_is_arrow_bool
   }
 \cs_generate_variant:Nn \chemformula_input_arrow:n { o }
 
@@ -1661,12 +1675,12 @@
   {
     \bool_if:nT
       {
-        \l_chemformula_is_name_bool &&
-        !\l_chemformula_first_last_text_bool &&
-        !\l_chemformula_first_last_math_bool
+        \l__chemformula_is_name_bool &&
+        !\l__chemformula_first_last_text_bool &&
+        !\l__chemformula_first_last_math_bool
       }
-      { \tl_put_right:Nn \l_chemformula_input_tl { #1 } }
-    \bool_set_false:N \l_chemformula_is_name_bool
+      { \tl_put_right:Nn \l__chemformula_input_tl { #1 } }
+    \bool_set_false:N \l__chemformula_is_name_bool
   }
 
 %-----------------------------------------------------------------------------%
@@ -1674,80 +1688,80 @@
 \cs_new:Npn \chemformula_input_escape_text:n #1
   {
     \chemformula_first_last_text:n { #1 }
-    \bool_if:NT \l_chemformula_first_last_double_bool
+    \bool_if:NT \l__chemformula_first_last_double_bool
       {
-        \bool_set_true:N \l_chemformula_first_last_text_bool
+        \bool_set_true:N \l__chemformula_first_last_text_bool
         \chemformula_read_escape_double:w #1 \q_nil
       }
-    \bool_if:NT \l_chemformula_first_last_single_bool
+    \bool_if:NT \l__chemformula_first_last_single_bool
       {
-        \bool_set_true:N \l_chemformula_first_last_text_bool
+        \bool_set_true:N \l__chemformula_first_last_text_bool
         \chemformula_read_escape_single:w #1 \q_nil
       }
   }
-\cs_generate_variant:Nn \chemformula_input_escape_text:n { o }
+\cs_generate_variant:Nn \chemformula_input_escape_text:n { V }
 
 \cs_new:Npn \chemformula_read_escape_double:w "#1" \q_nil
   {
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl
       { \ExplSyntaxNamesOn \char_set_catcode_other:N \: }
       { { #1 } }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
-    \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl }
-    \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
+    \tl_set_rescan:Nno \l__chemformula_tmpa_tl { \ExplSyntaxOff } { \l__chemformula_tmpa_tl }
+    \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
   }
 
 \cs_new:Npn \chemformula_read_escape_single:w '#1' \q_nil
   {
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl
       { \ExplSyntaxNamesOn \char_set_catcode_other:N \: }
       { { #1 } }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token?
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
-    \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl }
-    \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token?
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
+    \tl_set_rescan:Nno \l__chemformula_tmpa_tl { \ExplSyntaxOff } { \l__chemformula_tmpa_tl }
+    \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
   }
 
 \cs_new:Npn \chemformula_first_last_text:n #1
   {
-    \bool_set_false:N \l_chemformula_first_last_double_bool
-    \bool_set_false:N \l_chemformula_first_last_single_bool
-    \bool_set_false:N \l_chemformula_first_last_text_bool
-    \int_zero:N \l_chemformula_tmpa_int
-    \int_zero:N \l_chemformula_tmpb_int
-    \tl_map_inline:nn { #1 } { \int_incr:N \l_chemformula_tmpa_int }
+    \bool_set_false:N \l__chemformula_first_last_double_bool
+    \bool_set_false:N \l__chemformula_first_last_single_bool
+    \bool_set_false:N \l__chemformula_first_last_text_bool
+    \int_zero:N \l__chemformula_tmpa_int
+    \int_zero:N \l__chemformula_tmpb_int
+    \tl_map_inline:nn { #1 } { \int_incr:N \l__chemformula_tmpa_int }
     \tl_map_inline:nn { #1 }
       {
-        \int_incr:N \l_chemformula_tmpb_int
-        \int_compare:nT { \l_chemformula_tmpb_int = 1 }
+        \int_incr:N \l__chemformula_tmpb_int
+        \int_compare:nT { \l__chemformula_tmpb_int = 1 }
           {
             \tl_if_eq:nnT { ##1 } { " }
-              { \bool_set_true:N \l_chemformula_first_last_double_bool }
+              { \bool_set_true:N \l__chemformula_first_last_double_bool }
           }
-        \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int }
+        \int_compare:nT { \l__chemformula_tmpb_int = \l__chemformula_tmpa_int }
           {
             \tl_if_eq:nnF { ##1 } { " }
-              { \bool_set_false:N \l_chemformula_first_last_double_bool }
+              { \bool_set_false:N \l__chemformula_first_last_double_bool }
           }
       }
-    \bool_if:NF \l_chemformula_first_last_double_bool
+    \bool_if:NF \l__chemformula_first_last_double_bool
       {
-        \int_zero:N \l_chemformula_tmpb_int
+        \int_zero:N \l__chemformula_tmpb_int
         \tl_map_inline:nn { #1 }
           {
-            \int_incr:N \l_chemformula_tmpb_int
-            \int_compare:nT { \l_chemformula_tmpb_int = 1 }
+            \int_incr:N \l__chemformula_tmpb_int
+            \int_compare:nT { \l__chemformula_tmpb_int = 1 }
               {
                 \tl_if_eq:nnT { ##1 } { ' }
-                  { \bool_set_true:N \l_chemformula_first_last_single_bool }
+                  { \bool_set_true:N \l__chemformula_first_last_single_bool }
               }
-            \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int }
+            \int_compare:nT { \l__chemformula_tmpb_int = \l__chemformula_tmpa_int }
               {
                 \tl_if_eq:nnF { ##1 } { ' }
-                  { \bool_set_false:N \l_chemformula_first_last_single_bool }
+                  { \bool_set_false:N \l__chemformula_first_last_single_bool }
               }
           }
       }
@@ -1758,45 +1772,45 @@
 \cs_new:Npn \chemformula_input_escape_math:n #1
   {
     \chemformula_first_last_math:n { #1 }
-    \bool_if:NT \l_chemformula_first_last_math_bool
+    \bool_if:NT \l__chemformula_first_last_math_bool
       { \chemformula_read_escape_math:w #1 \q_nil }
   }
 
 \cs_new:Npn \chemformula_read_escape_math:w $#1$ \q_nil
   {
-    \tl_set_rescan:Nnn \l_chemformula_tmpa_tl
+    \tl_set_rescan:Nnn \l__chemformula_tmpa_tl
       {
         \ExplSyntaxNamesOn \char_set_catcode_letter:N \{
         \char_set_catcode_letter:N \}
       }
       { \mbox { \( #1 \) } }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token
-    \tl_replace_all:Nnn \l_chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
-    \tl_set_rescan:Nno \l_chemformula_tmpa_tl { \ExplSyntaxOff } { \l_chemformula_tmpa_tl }
-    \tl_put_right:NV \l_chemformula_input_tl \l_chemformula_tmpa_tl
-    \tl_put_right:Nn \l_chemformula_input_tl
-      { \skip_horizontal:N \l_chemformula_math_space_dim }
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { \_ } { chemformulaplaceholder }
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { _ } { \sb } % TODO use \c_math_subscript_token
+    \tl_replace_all:Nnn \l__chemformula_tmpa_tl { chemformulaplaceholder } { \_ }
+    \tl_set_rescan:Nno \l__chemformula_tmpa_tl { \ExplSyntaxOff } { \l__chemformula_tmpa_tl }
+    \tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
+    \tl_put_right:Nn \l__chemformula_input_tl
+      { \skip_horizontal:N \l__chemformula_math_space_dim }
   }
 
 \cs_new:Npn \chemformula_first_last_math:n #1
   {
-    \bool_set_false:N \l_chemformula_first_last_math_bool
-    \int_zero:N \l_chemformula_tmpa_int
-    \int_zero:N \l_chemformula_tmpb_int
-    \tl_map_inline:nn { #1 } { \int_incr:N \l_chemformula_tmpa_int }
+    \bool_set_false:N \l__chemformula_first_last_math_bool
+    \int_zero:N \l__chemformula_tmpa_int
+    \int_zero:N \l__chemformula_tmpb_int
+    \tl_map_inline:nn { #1 } { \int_incr:N \l__chemformula_tmpa_int }
     \tl_map_inline:nn { #1 }
       {
-        \int_incr:N \l_chemformula_tmpb_int
-        \int_compare:nT { \l_chemformula_tmpb_int = 1 }
+        \int_incr:N \l__chemformula_tmpb_int
+        \int_compare:nT { \l__chemformula_tmpb_int = 1 }
           {
             \tl_if_eq:nnT { ##1 } { $ }
-              { \bool_set_true:N \l_chemformula_first_last_math_bool }
+              { \bool_set_true:N \l__chemformula_first_last_math_bool }
           }
-        \int_compare:nT { \l_chemformula_tmpb_int = \l_chemformula_tmpa_int }
+        \int_compare:nT { \l__chemformula_tmpb_int = \l__chemformula_tmpa_int }
           {
             \tl_if_eq:nnF { ##1 } { $ }
-              { \bool_set_false:N \l_chemformula_first_last_math_bool }
+              { \bool_set_false:N \l__chemformula_first_last_math_bool }
           }
       }
   }
@@ -1807,95 +1821,95 @@
   {
     charge-hshift         .code:n    =
       \tl_if_eq:nnTF { #1 } { full }
-        { \bool_set_true:N \l_chemformula_charge_full_shift_bool }
+        { \bool_set_true:N \l__chemformula_charge_full_shift_bool }
         {
-          \bool_set_false:N \l_chemformula_charge_full_shift_bool
-          \dim_set:Nn \l_chemformula_charge_shift_dim { #1 }
+          \bool_set_false:N \l__chemformula_charge_full_shift_bool
+          \dim_set:Nn \l__chemformula_charge_shift_dim { #1 }
         } ,
     charge-hshift         .default:n = .5ex ,
     charge-vshift         .code:n    =
       {
-        \dim_set:Nn \l_chemformula_superscript_shift_additional_dim { #1 }
-        \dim_set:Nn \l_chemformula_superscript_shift_dim
+        \dim_set:Nn \l__chemformula_superscript_shift_additional_dim { #1 }
+        \dim_set:Nn \l__chemformula_superscript_shift_dim
           {
-            \l_chemformula_superscript_shift_default_dim +
-            \l_chemformula_superscript_shift_additional_dim
+            \l__chemformula_superscript_shift_default_dim +
+            \l__chemformula_superscript_shift_additional_dim
           }
       } ,
     charge-style          .choice: ,
     charge-style / text   .code:n    =
-      \bool_set_false:N \l_chemformula_charge_style_math_bool ,
+      \bool_set_false:N \l__chemformula_charge_style_math_bool ,
     charge-style / math   .code:n    =
-      \bool_set_true:N \l_chemformula_charge_style_math_bool ,
+      \bool_set_true:N \l__chemformula_charge_style_math_bool ,
     subscript-vshift      .code:n    =
       {
-        \dim_set:Nn \l_chemformula_subscript_shift_additional_dim { #1 }
-        \dim_set:Nn \l_chemformula_subscript_shift_dim
+        \dim_set:Nn \l__chemformula_subscript_shift_additional_dim { #1 }
+        \dim_set:Nn \l__chemformula_subscript_shift_dim
           {
-            \l_chemformula_subscript_shift_default_dim +
-            \l_chemformula_subscript_shift_additional_dim
+            \l__chemformula_subscript_shift_default_dim +
+            \l__chemformula_subscript_shift_additional_dim
           }
       } ,
     subscript-vshift      .default:n = 0pt ,
     subscript-style       .choice: ,
     subscript-style / text .code:n   =
-      \bool_set_false:N \l_chemformula_number_style_math_bool ,
+      \bool_set_false:N \l__chemformula_number_style_math_bool ,
     subscript-style / math .code:n   =
-      \bool_set_true:N \l_chemformula_number_style_math_bool ,
-    decimal-marker        .tl_set:N  = \l_chemformula_decimal_output_tl ,
+      \bool_set_true:N \l__chemformula_number_style_math_bool ,
+    decimal-marker        .tl_set:N  = \l__chemformula_decimal_output_tl ,
     frac-style            .choice: ,
     frac-style / math     .code:n    =
-      \bool_set_false:N \l_chemformula_xfrac_bool
-      \bool_set_false:N \l_chemformula_nicefrac_bool
-      \bool_set_true:N \l_chemformula_mathfrac_bool ,
+      \bool_set_false:N \l__chemformula_xfrac_bool
+      \bool_set_false:N \l__chemformula_nicefrac_bool
+      \bool_set_true:N \l__chemformula_mathfrac_bool ,
     frac-style / xfrac    .code:n    =
-      \bool_set_true:N \l_chemformula_xfrac_bool
-      \bool_set_false:N \l_chemformula_nicefrac_bool
-      \bool_set_false:N \l_chemformula_mathfrac_bool ,
+      \bool_set_true:N \l__chemformula_xfrac_bool
+      \bool_set_false:N \l__chemformula_nicefrac_bool
+      \bool_set_false:N \l__chemformula_mathfrac_bool ,
     frac-style / nicefrac .code:n    =
-      \bool_set_false:N \l_chemformula_xfrac_bool
-      \bool_set_true:N \l_chemformula_nicefrac_bool
-      \bool_set_false:N \l_chemformula_mathfrac_bool ,
-    stoich-space          .dim_set:N = \l_chemformula_stoich_space_dim ,
-    adduct-space          .dim_set:N = \l_chemformula_cdot_space_dim ,
-    plus-space            .dim_set:N = \l_chemformula_plus_space_dim ,
-    math-space            .dim_set:N = \l_chemformula_math_space_dim ,
-    name-format           .tl_set:N  = \l_chemformula_name_format_tl ,
+      \bool_set_false:N \l__chemformula_xfrac_bool
+      \bool_set_true:N \l__chemformula_nicefrac_bool
+      \bool_set_false:N \l__chemformula_mathfrac_bool ,
+    stoich-space          .dim_set:N = \l__chemformula_stoich_space_dim ,
+    adduct-space          .dim_set:N = \l__chemformula_cdot_space_dim ,
+    plus-space            .dim_set:N = \l__chemformula_plus_space_dim ,
+    math-space            .dim_set:N = \l__chemformula_math_space_dim ,
+    name-format           .tl_set:N  = \l__chemformula_name_format_tl ,
     name-width            .code:n    =
       {
         \tl_if_eq:nnTF { #1 } { auto }
-          { \bool_set_false:N \l_chemformula_name_width_bool }
+          { \bool_set_false:N \l__chemformula_name_width_bool }
           {
-            \bool_set_true:N \l_chemformula_name_width_bool
-            \dim_set:Nn \l_chemformula_name_dim { #1 }
+            \bool_set_true:N \l__chemformula_name_width_bool
+            \dim_set:Nn \l__chemformula_name_dim { #1 }
           }
       } ,
-    bond-length           .dim_set:N = \l_chemformula_bond_dim ,
-    bond-offset           .dim_set:N = \l_chemformula_bond_space_dim ,
-    bond-style            .tl_set:N  = \l_chemformula_bond_style_tl ,
+    bond-length           .dim_set:N = \l__chemformula_bond_dim ,
+    bond-offset           .dim_set:N = \l__chemformula_bond_space_dim ,
+    bond-style            .tl_set:N  = \l__chemformula_bond_style_tl ,
     font-family           .code:n    =
-      \bool_set_true:N \l_chemformula_fss_bool
-      \bool_set_false:N \l_chemformula_fontspec_bool
-      \bool_set_true:N \l_chemformula_fss_family_bool
-      \tl_set:Nn \l_chemformula_font_family_tl { #1 } ,
+      \bool_set_true:N \l__chemformula_fss_bool
+      \bool_set_false:N \l__chemformula_fontspec_bool
+      \bool_set_true:N \l__chemformula_fss_family_bool
+      \tl_set:Nn \l__chemformula_font_family_tl { #1 } ,
     font-series           .code:n    =
-      \bool_set_true:N \l_chemformula_fss_bool
-      \bool_set_false:N \l_chemformula_fontspec_bool
-      \bool_set_true:N \l_chemformula_fss_series_bool
-      \tl_set:Nn \l_chemformula_font_series_tl { #1 } ,
+      \bool_set_true:N \l__chemformula_fss_bool
+      \bool_set_false:N \l__chemformula_fontspec_bool
+      \bool_set_true:N \l__chemformula_fss_series_bool
+      \tl_set:Nn \l__chemformula_font_series_tl { #1 } ,
     font-shape            .code:n    =
-      \bool_set_true:N \l_chemformula_fss_bool
-      \bool_set_false:N \l_chemformula_fontspec_bool
-      \bool_set_true:N \l_chemformula_fss_shape_bool
-      \tl_set:Nn \l_chemformula_font_shape_tl { #1 } ,
+      \bool_set_true:N \l__chemformula_fss_bool
+      \bool_set_false:N \l__chemformula_fontspec_bool
+      \bool_set_true:N \l__chemformula_fss_shape_bool
+      \tl_set:Nn \l__chemformula_font_shape_tl { #1 } ,
     font-spec             .code:n    =
-      \bool_set_false:N \l_chemformula_fss_bool
-      \bool_set_true:N \l_chemformula_fontspec_bool
+      \bool_set_false:N \l__chemformula_fss_bool
+      \bool_set_true:N \l__chemformula_fontspec_bool
       \chemformula_fontspec:n { #1 } ,
     format                .code:n    =
-      \bool_set_false:N \l_chemformula_fss_bool
-      \bool_set_false:N \l_chemformula_fontspec_bool
-      \tl_set:Nn \l_chemformula_format_tl { #1 }
+      \bool_set_false:N \l__chemformula_fss_bool
+      \bool_set_false:N \l__chemformula_fontspec_bool
+      \tl_set:Nn \l__chemformula_format_tl { #1 }
   }
 
 %-----------------------------------------------------------------------------%
diff --git a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
index 3c4c74bc299..26b5fae721b 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/chemmacros.sty
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -29,8 +29,8 @@
 \RequirePackage{ expl3 , xparse , l3keys2e , xfrac , siunitx }
 \RequirePackage{ tikz , mathtools , environ , scrlfile , etoolbox , bm }
 \usetikzlibrary{calc,arrows}
-\def\chemmacros@version{3.4a}
-\def\chemmacros@date{2012/10/03}
+\def\chemmacros@version{3.4b}
+\def\chemmacros@date{2013/01/04}
 
 \ProvidesExplPackage
   {chemmacros}
@@ -40,51 +40,51 @@
 
 \@ifpackageloaded { chemformula } {} { \RequirePackage { chemformula } }
 
-\bool_new:N \l_chemmacros_version_one_bool
-\bool_new:N \l_chemmacros_xspace_bool
-  \bool_set_true:N \l_chemmacros_xspace_bool
-\bool_new:N \l_chemmacros_bpchem_bool
-\bool_new:N \l_chemmacros_circled_bool
-  \bool_set_true:N \l_chemmacros_circled_bool
-\bool_new:N \l_chemmacros_circled_formal_bool
-  \bool_set_true:N \l_chemmacros_circled_formal_bool
-\bool_new:N \l_chemmacros_circled_chem_bool
-  \bool_set_true:N \l_chemmacros_circled_chem_bool
-\bool_new:N \l_chemmacros_EZ_cool_bool
-\bool_new:N \l_chemmacros_Nu_mathspec_bool
-\bool_new:N \l_chemmacros_use_mhchem_bool
-\bool_new:N \l_chemmacros_chemstyle_bool
-\bool_new:N \l_chemmacros_hyperref_bool
-\bool_new:N \l_chemmacros_varioref_bool
-\bool_new:N \l_chemmacros_chemfig_bool
-\bool_new:N \l_chemmacros_ghsystem_bool
-  \bool_set_true:N \l_chemmacros_ghsystem_bool
-\bool_new:N \l_chemmacros_iupac_restricted_bool
-\bool_new:N \l_chemmacros_iupac_strict_bool
-\bool_new:N \l_chemmacros_in_document_bool
+\bool_new:N \l__chemmacros_version_one_bool
+\bool_new:N \l__chemmacros_xspace_bool
+  \bool_set_true:N \l__chemmacros_xspace_bool
+\bool_new:N \l__chemmacros_bpchem_bool
+\bool_new:N \l__chemmacros_circled_bool
+  \bool_set_true:N \l__chemmacros_circled_bool
+\bool_new:N \l__chemmacros_circled_formal_bool
+  \bool_set_true:N \l__chemmacros_circled_formal_bool
+\bool_new:N \l__chemmacros_circled_chem_bool
+  \bool_set_true:N \l__chemmacros_circled_chem_bool
+\bool_new:N \l__chemmacros_EZ_cool_bool
+\bool_new:N \l__chemmacros_Nu_mathspec_bool
+\bool_new:N \l__chemmacros_use_mhchem_bool
+\bool_new:N \l__chemmacros_chemstyle_bool
+\bool_new:N \l__chemmacros_hyperref_bool
+\bool_new:N \l__chemmacros_varioref_bool
+\bool_new:N \l__chemmacros_chemfig_bool
+\bool_new:N \l__chemmacros_ghsystem_bool
+  \bool_set_true:N \l__chemmacros_ghsystem_bool
+\bool_new:N \l__chemmacros_iupac_restricted_bool
+\bool_new:N \l__chemmacros_iupac_strict_bool
+\bool_new:N \l__chemmacros_in_document_bool
 
 \AtBeginDocument
   {
-    \bool_set_true:N \l_chemmacros_in_document_bool
+    \bool_set_true:N \l__chemmacros_in_document_bool
     \@ifpackageloaded { chemstyle }
-      { \bool_set_true:N \l_chemmacros_chemstyle_bool }
-      { \bool_set_false:N \l_chemmacros_chemstyle_bool }
+      { \bool_set_true:N \l__chemmacros_chemstyle_bool }
+      { \bool_set_false:N \l__chemmacros_chemstyle_bool }
     \@ifpackageloaded { varioref }
-      { \bool_set_true:N \l_chemmacros_varioref_bool }
-      { \bool_set_false:N \l_chemmacros_varioref_bool }
+      { \bool_set_true:N \l__chemmacros_varioref_bool }
+      { \bool_set_false:N \l__chemmacros_varioref_bool }
     \@ifpackageloaded { hyperref }
-      { \bool_set_true:N \l_chemmacros_hyperref_bool }
-      { \bool_set_false:N \l_chemmacros_hyperref_bool }
+      { \bool_set_true:N \l__chemmacros_hyperref_bool }
+      { \bool_set_false:N \l__chemmacros_hyperref_bool }
     \@ifpackageloaded { chemfig }
-      { \bool_set_true:N \l_chemmacros_chemfig_bool }
-      { \bool_set_false:N \l_chemmacros_chemfig_bool }
+      { \bool_set_true:N \l__chemmacros_chemfig_bool }
+      { \bool_set_false:N \l__chemmacros_chemfig_bool }
   }
 
 % --------------------------------------------------------------------------- %
 % warning / error messages
 \cs_new:Npn \chemmacros_msg:nnxx #1#2#3#4
   {
-    \bool_if:NTF \l_chemmacros_strict_bool
+    \bool_if:NTF \l__chemmacros_strict_bool
       { \msg_error:nnxx { #1 } { #2 } { #3 } { #4 } }
       { \msg_warning:nnxx { #1 } { #2 } { #3 } { #4 } }
   }
@@ -265,9 +265,9 @@
 
 % --------------------------------------------------------------------------- %
 % scratch variables
-\tl_new:N  \l_chemmacros_tmpa_tl
-\tl_new:N  \l_chemmacros_tmpb_tl
-\int_new:N \l_chemmacros_tmpa_int
+\tl_new:N  \l__chemmacros_tmpa_tl
+\tl_new:N  \l__chemmacros_tmpb_tl
+\int_new:N \l__chemmacros_tmpa_int
 
 % --------------------------------------------------------------------------- %
 % package options
@@ -286,45 +286,45 @@
 %   version=1   => compatibility for documents set with v1.*
 %   xspace      => add an \xspace after a whole bunch of macros
 
-\bool_new:N \l_chemmacros_strict_bool
-\bool_new:N \l_chemmacros_detect_bold_bool
-\bool_set_true:N \l_chemmacros_detect_bold_bool
+\bool_new:N \l__chemmacros_strict_bool
+\bool_new:N \l__chemmacros_detect_bold_bool
+\bool_set_true:N \l__chemmacros_detect_bold_bool
 
-\bool_new:N \l_chemmacros_use_upgreek_bool
-\bool_new:N \l_chemmacros_use_textgreek_bool
-\bool_new:N \l_chemmacros_option_upgreek_set_bool
+\bool_new:N \l__chemmacros_use_upgreek_bool
+\bool_new:N \l__chemmacros_use_textgreek_bool
+\bool_new:N \l__chemmacros_option_upgreek_set_bool
 
-\tl_new:N \l_chemmacros_language_tl
-\tl_set:Nn \l_chemmacros_language_tl { english }
-\tl_new:N \l_chemmacros_current_language_tl
-\tl_set:Nn \l_chemmacros_current_language_tl { english }
+\tl_new:N \l__chemmacros_language_tl
+\tl_set:Nn \l__chemmacros_language_tl { english }
+\tl_new:N \l__chemmacros_current_language_tl
+\tl_set:Nn \l__chemmacros_current_language_tl { english }
 
 \cs_new:Npn \chemmacros_inner_font: {}
 
 \keys_define:nn { chemmacros / option }
   {
-    bpchem             .bool_set:N = \l_chemmacros_bpchem_bool ,
+    bpchem             .bool_set:N = \l__chemmacros_bpchem_bool ,
     bpchem             .default:n  = true ,
     circletype         .choice: ,
     circletype / math  .code:n  =
-      { \bool_set_false:N \l_chemmacros_circled_chem_bool } ,
+      { \bool_set_false:N \l__chemmacros_circled_chem_bool } ,
     circletype / chem  .code:n  =
-      { \bool_set_true:N \l_chemmacros_circled_chem_bool } ,
+      { \bool_set_true:N \l__chemmacros_circled_chem_bool } ,
     circled            .choice: ,
     circled / none     .code:n     =
       {
-        \bool_set_false:N \l_chemmacros_circled_bool
-        \bool_set_false:N \l_chemmacros_circled_formal_bool
+        \bool_set_false:N \l__chemmacros_circled_bool
+        \bool_set_false:N \l__chemmacros_circled_formal_bool
       } ,
     circled / formal   .code:n    =
       {
-        \bool_set_true:N \l_chemmacros_circled_bool
-        \bool_set_true:N \l_chemmacros_circled_formal_bool
+        \bool_set_true:N \l__chemmacros_circled_bool
+        \bool_set_true:N \l__chemmacros_circled_formal_bool
       } ,
     circled / all      .code:n     =
       {
-        \bool_set_true:N \l_chemmacros_circled_bool
-        \bool_set_false:N \l_chemmacros_circled_formal_bool
+        \bool_set_true:N \l__chemmacros_circled_bool
+        \bool_set_false:N \l__chemmacros_circled_formal_bool
       } ,
     circled            .default:n  = all ,
     detect-bold        .code:n     =
@@ -333,33 +333,33 @@
     EZ                 .code:n     =
       \chemmacros_msg:nnxx { chemmacros } { option-deprecated } { EZ } {} ,
     german             .code:n     =
-      \tl_set:Nn \l_chemmacros_language_tl { german } ,
+      \tl_set:Nn \l__chemmacros_language_tl { german } ,
     ngerman            .code:n     =
-      \tl_set:Nn \l_chemmacros_language_tl { ngerman } ,
-    ghsystem           .bool_set:N = \l_chemmacros_ghsystem_bool ,
+      \tl_set:Nn \l__chemmacros_language_tl { ngerman } ,
+    ghsystem           .bool_set:N = \l__chemmacros_ghsystem_bool ,
     ghsystem           .default:n  = true ,
     iupac              .choice: ,
     iupac / restricted .code:n     =
-      \bool_set_true:N \l_chemmacros_iupac_restricted_bool
-      \bool_set_false:N \l_chemmacros_iupac_strict_bool ,
+      \bool_set_true:N \l__chemmacros_iupac_restricted_bool
+      \bool_set_false:N \l__chemmacros_iupac_strict_bool ,
     iupac / auto       .code:n     =
-      \bool_set_false:N \l_chemmacros_iupac_restricted_bool
-      \bool_set_false:N \l_chemmacros_iupac_strict_bool ,
+      \bool_set_false:N \l__chemmacros_iupac_restricted_bool
+      \bool_set_false:N \l__chemmacros_iupac_strict_bool ,
     iupac / strict     .code:n     =
-      \bool_set_false:N \l_chemmacros_iupac_restricted_bool
-      \bool_set_true:N \l_chemmacros_iupac_strict_bool ,
-    language           .tl_set:N   = \l_chemmacros_language_tl ,
+      \bool_set_false:N \l__chemmacros_iupac_restricted_bool
+      \bool_set_true:N \l__chemmacros_iupac_strict_bool ,
+    language           .tl_set:N   = \l__chemmacros_language_tl ,
     method             .choice: ,
     method / chemformula   .code:n     =
-      \bool_set_false:N \l_chemmacros_use_mhchem_bool ,
+      \bool_set_false:N \l__chemmacros_use_mhchem_bool ,
     method / mhchem    .code:n     =
-      \bool_set_true:N \l_chemmacros_use_mhchem_bool ,
+      \bool_set_true:N \l__chemmacros_use_mhchem_bool ,
     Nu                 .choice: ,
     Nu / mathspec      .code:n     =
-     \bool_set_true:N \l_chemmacros_Nu_mathspec_bool ,
+     \bool_set_true:N \l__chemmacros_Nu_mathspec_bool ,
     Nu / chemmacros    .code:n     =
-     \bool_set_false:N \l_chemmacros_Nu_mathspec_bool ,
-    strict             .bool_set:N = \l_chemmacros_strict_bool ,
+     \bool_set_false:N \l__chemmacros_Nu_mathspec_bool ,
+    strict             .bool_set:N = \l__chemmacros_strict_bool ,
     strict             .default:n  = true ,
     synchronize        .choice: ,
     synchronize / true .code:n     =
@@ -368,17 +368,17 @@
     synchronize        .default:n  = true ,
     greek              .choice: ,
     greek / upgreek    .code:n     =
-      \bool_set_true:N \l_chemmacros_use_upgreek_bool
-      \bool_set_false:N  \l_chemmacros_use_textgreek_bool
-      \bool_set_true:N \l_chemmacros_option_upgreek_set_bool ,
+      \bool_set_true:N \l__chemmacros_use_upgreek_bool
+      \bool_set_false:N  \l__chemmacros_use_textgreek_bool
+      \bool_set_true:N \l__chemmacros_option_upgreek_set_bool ,
     greek / textgreek   .code:n    =
-      \bool_set_false:N \l_chemmacros_use_upgreek_bool
-      \bool_set_true:N  \l_chemmacros_use_textgreek_bool
-      \bool_set_true:N \l_chemmacros_option_upgreek_set_bool ,
+      \bool_set_false:N \l__chemmacros_use_upgreek_bool
+      \bool_set_true:N  \l__chemmacros_use_textgreek_bool
+      \bool_set_true:N \l__chemmacros_option_upgreek_set_bool ,
     greek / math       .code:n     =
-      \bool_set_false:N \l_chemmacros_use_upgreek_bool
-      \bool_set_false:N  \l_chemmacros_use_textgreek_bool
-      \bool_set_true:N \l_chemmacros_option_upgreek_set_bool ,
+      \bool_set_false:N \l__chemmacros_use_upgreek_bool
+      \bool_set_false:N  \l__chemmacros_use_textgreek_bool
+      \bool_set_true:N \l__chemmacros_option_upgreek_set_bool ,
     greek              .default:n  = upgreek ,
     upgreek            .code:n     =
       \chemmacros_msg:nnxx { chemmacros } { option-deprecated }
@@ -390,12 +390,12 @@
       { version } {} ,
     cmversion          .choice: ,
     cmversion / 1      .code:n     =
-      { \bool_set_true:N \l_chemmacros_version_one_bool } ,
+      { \bool_set_true:N \l__chemmacros_version_one_bool } ,
     cmversion / 2      .code:n     =
-      { \bool_set_false:N \l_chemmacros_version_one_bool } ,
+      { \bool_set_false:N \l__chemmacros_version_one_bool } ,
     cmversion / bundle .code:n     =
-      { \bool_set_false:N \l_chemmacros_version_one_bool } ,
-    xspace             .bool_set:N = \l_chemmacros_xspace_bool ,
+      { \bool_set_false:N \l__chemmacros_version_one_bool } ,
+    xspace             .bool_set:N = \l__chemmacros_xspace_bool ,
     xspace             .default:n  = true
   }
 
@@ -403,34 +403,34 @@
 
 % --------------------------------------------------------------------------- %
 % language settings:
-\prop_new:N \l_chemmacros_language_prop
-\prop_put:Nnn \l_chemmacros_language_prop { english }  { english }
-\prop_put:Nnn \l_chemmacros_language_prop { american } { english }
-\prop_put:Nnn \l_chemmacros_language_prop { british }  { english }
-\prop_put:Nnn \l_chemmacros_language_prop { german }   { german }
-\prop_put:Nnn \l_chemmacros_language_prop { ngerman }  { german }
-\prop_put:Nnn \l_chemmacros_language_prop { italian }  { italian }
-\prop_put:Nnn \l_chemmacros_language_prop { french }   { french }
+\prop_new:N \l__chemmacros_language_prop
+\prop_put:Nnn \l__chemmacros_language_prop { english }  { english }
+\prop_put:Nnn \l__chemmacros_language_prop { american } { english }
+\prop_put:Nnn \l__chemmacros_language_prop { british }  { english }
+\prop_put:Nnn \l__chemmacros_language_prop { german }   { german }
+\prop_put:Nnn \l__chemmacros_language_prop { ngerman }  { german }
+\prop_put:Nnn \l__chemmacros_language_prop { italian }  { italian }
+\prop_put:Nnn \l__chemmacros_language_prop { french }   { french }
 
-\prop_map_inline:Nn \l_chemmacros_language_prop
+\prop_map_inline:Nn \l__chemmacros_language_prop
   {
-    \cs_if_exist:cF { l_chemmacros_ #2 _bool }
-      { \bool_new:c { l_chemmacros_ #2 _bool } }
+    \cs_if_exist:cF { l__chemmacros_ #2 _bool }
+      { \bool_new:c { l__chemmacros_ #2 _bool } }
   }
 
 \cs_new_nopar:Npn \chemmacros_set_language:
   {
     \prop_get:NoNTF
-      \l_chemmacros_language_prop
-      { \l_chemmacros_language_tl }
-      \l_chemmacros_current_language_tl
+      \l__chemmacros_language_prop
+      { \l__chemmacros_language_tl }
+      \l__chemmacros_current_language_tl
       {
         \bool_set_true:c
-          { l_chemmacros_ \l_chemmacros_current_language_tl _bool }
+          { l__chemmacros_ \l__chemmacros_current_language_tl _bool }
       }
       {
         \chemmacros_msg:nnxx { chemmacros } { language-not-defined }
-          { \l_chemmacros_language_tl } { }
+          { \l__chemmacros_language_tl } { }
       }
   }
 
@@ -438,25 +438,25 @@
   {
     \chemmacros_set_language:
     \chemmacros_make_phases:
-    \bool_if:NT \l_chemmacros_ghsystem_bool
+    \bool_if:NT \l__chemmacros_ghsystem_bool
       { \RequirePackage { ghsystem } }
-    \bool_if:NT \l_chemmacros_bpchem_bool
+    \bool_if:NT \l__chemmacros_bpchem_bool
       { \RequirePackage { bpchem } }
-    \bool_if:NT \l_chemmacros_xspace_bool
+    \bool_if:NT \l__chemmacros_xspace_bool
       { \RequirePackage { xspace } }
-    \bool_if:NT \l_chemmacros_use_mhchem_bool
+    \bool_if:NT \l__chemmacros_use_mhchem_bool
       { \RequirePackage[ version=3 ]{ mhchem } }
-    \bool_if:NF \l_chemmacros_option_upgreek_set_bool
+    \bool_if:NF \l__chemmacros_option_upgreek_set_bool
       {
         \@ifpackageloaded { upgreek }
-          { \bool_set_true:N \l_chemmacros_use_upgreek_bool }
+          { \bool_set_true:N \l__chemmacros_use_upgreek_bool }
           {
             \@ifpackageloaded { textgreek }
-              { \bool_set_true:N  \l_chemmacros_use_textgreek_bool }
+              { \bool_set_true:N  \l__chemmacros_use_textgreek_bool }
               {}
           }
       }
-    \bool_if:NTF \l_chemmacros_use_upgreek_bool
+    \bool_if:NTF \l__chemmacros_use_upgreek_bool
       {
         \cs_set_nopar:Npn \Chemalpha   { \ensuremath { \upalpha } }
         \cs_set_nopar:Npn \Chembeta    { \ensuremath { \upbeta } }
@@ -474,7 +474,7 @@
         \cs_set_nopar:Npn \ChemDelta   { \ensuremath { \Updelta } }
       }
       {
-        \bool_if:NT \l_chemmacros_use_textgreek_bool
+        \bool_if:NT \l__chemmacros_use_textgreek_bool
           {
             \cs_set_nopar:Npn \Chemalpha
               { \ensuremath { \text { \textalpha } } }
@@ -525,7 +525,7 @@
 
 \cs_new_nopar:Npn \chemmacros_xspace:
   {
-    \bool_if:NT \l_chemmacros_xspace_bool
+    \bool_if:NT \l__chemmacros_xspace_bool
       { \xspace }
   }
 
@@ -610,9 +610,9 @@
 \cs_new_nopar:Npn \chemmacros_plus:
   {
     \bool_if:nTF
-      { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool }
+      { \l__chemmacros_circled_bool && !\l__chemmacros_circled_formal_bool }
       {
-        \bool_if:NTF \l_chemmacros_circled_chem_bool
+        \bool_if:NTF \l__chemmacros_circled_chem_bool
           { \chemmacros_fplus: }
           { \oplus }
       }
@@ -622,9 +622,9 @@
 \cs_new_nopar:Npn \chemmacros_minus:
   {
     \bool_if:nTF
-      { \l_chemmacros_circled_bool && !\l_chemmacros_circled_formal_bool }
+      { \l__chemmacros_circled_bool && !\l__chemmacros_circled_formal_bool }
       {
-        \bool_if:NTF \l_chemmacros_circled_chem_bool
+        \bool_if:NTF \l__chemmacros_circled_chem_bool
           { \chemmacros_fminus: }
           { \ominus }
       }
@@ -633,13 +633,13 @@
 
 \cs_new_nopar:Npn \chemmacros_formal_plus:
   {
-    \bool_set_false:N \l_chemmacros_circled_formal_bool
+    \bool_set_false:N \l__chemmacros_circled_formal_bool
     \chemmacros_plus:
   }
 
 \cs_new_nopar:Npn \chemmacros_formal_minus:
   {
-    \bool_set_false:N \l_chemmacros_circled_formal_bool
+    \bool_set_false:N \l__chemmacros_circled_formal_bool
     \chemmacros_minus:
   }
 
@@ -684,18 +684,18 @@
 
 % add a possibility to let chemformula use the chemformula
 % with method=chemformula, too
-\tl_new:N \l_chemmacros_chemformula_tl
+\tl_new:N \l__chemmacros_chemformula_tl
 \cs_new:Npn \chemmacros_chemformula:n #1
   {
-    \bool_if:NTF \l_chemmacros_use_mhchem_bool
+    \bool_if:NTF \l__chemmacros_use_mhchem_bool
       { \ce { #1 } }
       {
         \group_begin:
         \cs_set_eq:NN \chemformula_font_inner: \chemmacros_inner_font:
-        \chemformula_input_cmpd:nN { #1 } \l_chemmacros_chemformula_tl
+        \chemformula_input_cmpd:nN { #1 } \l__chemmacros_chemformula_tl
         \mode_if_math:TF
-          { \text { \l_chemmacros_chemformula_tl } }
-          { { \l_chemmacros_chemformula_tl } }
+          { \text { \l__chemmacros_chemformula_tl } }
+          { { \l__chemmacros_chemformula_tl } }
         \group_end:
       }
   }
@@ -703,11 +703,11 @@
 
 % --------------------------------------------------------------------------- %
 % particles, charges
-\bool_new:N \l_chemmacros_charge_append_bool
-\bool_set_false:N \l_chemmacros_charge_append_bool
+\bool_new:N \l__chemmacros_charge_append_bool
+\bool_set_false:N \l__chemmacros_charge_append_bool
 
 % \DeclareChemParticle, \RenewChemParticle
-\bool_if:NTF \l_chemmacros_use_mhchem_bool
+\bool_if:NTF \l__chemmacros_use_mhchem_bool
   {
     \NewDocumentCommand \DeclareChemParticle { mm }
       {
@@ -747,29 +747,29 @@
   {
     \cs_set_nopar:Npn #1
       {
-        \bool_if:NTF \l_chemformula_inside_ch_bool
+        \bool_if:NTF \l__chemformula_inside_ch_bool
           {
-            \chemformula_input_cmpd:nN { #2 } \l_chemmacros_chemformula_tl
-            \tl_set_rescan:Nno \l_chemmacros_chemformula_tl
+            \chemformula_input_cmpd:nN { #2 } \l__chemmacros_chemformula_tl
+            \tl_set_rescan:Nno \l__chemmacros_chemformula_tl
               { \ExplSyntaxOn }
-              { \l_chemmacros_chemformula_tl }
-            \tl_use:N \l_chemmacros_chemformula_tl
-            \tl_clear:N \l_chemmacros_chemformula_tl
+              { \l__chemmacros_chemformula_tl }
+            \tl_use:N \l__chemmacros_chemformula_tl
+            \tl_clear:N \l__chemmacros_chemformula_tl
           }
           {
             \group_begin:
               \chemformula_input:n { #2 }
-              \tl_set_rescan:Nno \l_chemmacros_tmpa_tl
+              \tl_set_rescan:Nno \l__chemmacros_tmpa_tl
                 { \ExplSyntaxOn }
-                { \l_chemformula_input_tl }
-              \chemformula_write:V \l_chemmacros_tmpa_tl
+                { \l__chemformula_input_tl }
+              \chemformula_write:V \l__chemmacros_tmpa_tl
             \group_end:
             \chemmacros_xspace:
           }
       }
   }
 
-\bool_if:NTF \l_chemmacros_use_mhchem_bool
+\bool_if:NTF \l__chemmacros_use_mhchem_bool
   {
     \cs_new_nopar:Npn \el { \chemmacros_atom:n { e } \mch \chemmacros_xspace: }
     \cs_new_nopar:Npn \prt { \chemmacros_atom:n { p } \pch \chemmacros_xspace: }
@@ -783,14 +783,14 @@
 
 \cs_new_nopar:Npn \chemmacros_bm:n #1
   {
-    \bool_if:NTF \l_chemmacros_detect_bold_bool
+    \bool_if:NTF \l__chemmacros_detect_bold_bool
       { \bm { #1 } }
       { #1 }
   }
 
 \cs_new_nopar:Npn \chemmacros_bf:n #1
   {
-    \bool_if:NTF \l_chemmacros_detect_bold_bool
+    \bool_if:NTF \l__chemmacros_detect_bold_bool
       { { \normalfont \bfseries #1 } }
       { { \normalfont #1 } }
   }
@@ -816,7 +816,7 @@
 % charges
 \cs_new_nopar:Npn \chemmacros_charge:n #1
   {
-    \bool_if:NTF \l_chemmacros_charge_append_bool
+    \bool_if:NTF \l__chemmacros_charge_append_bool
       {
         \mode_if_math:TF
           { {}^ { \chemmacros_detect_bold:n { #1 } } }
@@ -831,7 +831,7 @@
 
 \keys_define:nn { chemmacros / charges }
   {
-    append .bool_set:N = \l_chemmacros_charge_append_bool ,
+    append .bool_set:N = \l__chemmacros_charge_append_bool ,
     append .default:n  = true
   }
 
@@ -887,7 +887,7 @@
 % --------------------------------------------------------------------------- %
 % ions, molecules
 % proton, hydroxide, hydronium/oxonium, water, nucleophile, electrophile
-\bool_if:NTF \l_chemmacros_use_mhchem_bool
+\bool_if:NTF \l__chemmacros_use_mhchem_bool
   {
     \cs_new_nopar:Npn \Hpl { \chemmacros_atom:n { H } \pch \chemmacros_xspace: }
     \cs_new_nopar:Npn \Hyd
@@ -908,10 +908,10 @@
 \NewDocumentCommand \chemmacros_Nu:w { o }
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / particle } { #1 } }
-    \bool_if:NTF \l_chemmacros_particle_elpair_bool
+    \bool_if:NTF \l__chemmacros_particle_elpair_bool
       { \chemmacros_elpair:n { Nu } \mch }
       {
-        \bool_if:NTF \l_chemmacros_use_mhchem_bool
+        \bool_if:NTF \l__chemmacros_use_mhchem_bool
           { \chemmacros_atom:n { Nu } \mch }
           { \chemmacros_chemformula:n { Nu- } }
       }
@@ -920,7 +920,7 @@
 
 \AtBeginDocument
   {
-    \bool_if:NTF \l_chemmacros_Nu_mathspec_bool
+    \bool_if:NTF \l__chemmacros_Nu_mathspec_bool
       { \cs_set_eq:NN \Nuc \chemmacros_Nu:w }
       { \cs_set_eq:NN \Nu \chemmacros_Nu:w }
   }
@@ -928,10 +928,10 @@
 \NewDocumentCommand \ba { o }
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / particle } { #1 } }
-    \bool_if:NTF \l_chemmacros_particle_elpair_bool
+    \bool_if:NTF \l__chemmacros_particle_elpair_bool
       { \chemmacros_elpair:n { ba } \mch }
       {
-        \bool_if:NTF \l_chemmacros_use_mhchem_bool
+        \bool_if:NTF \l__chemmacros_use_mhchem_bool
           { \chemmacros_atom:n { ba } \mch }
           { \chemmacros_chemformula:n { ba- } }
       }
@@ -940,9 +940,9 @@
 
 \cs_new_nopar:Npn \chemmacros_elpair:n #1
   {
-    \bool_if:NTF \l_chemmacros_chemfig_bool
+    \bool_if:NTF \l__chemmacros_chemfig_bool
       {
-        \bool_if:NTF \l_chemmacros_elpair_dots_bool
+        \bool_if:NTF \l__chemmacros_elpair_dots_bool
           {
             { \chemmacros_inner_font: #1 \Lewis { 0: , { \vphantom { #1 } } } }
           }
@@ -954,70 +954,70 @@
       }
   }
 
-\bool_new:N \l_chemmacros_particle_elpair_bool
-\bool_new:N \l_chemmacros_elpair_dots_bool
+\bool_new:N \l__chemmacros_particle_elpair_bool
+\bool_new:N \l__chemmacros_elpair_dots_bool
 
 \keys_define:nn { chemmacros / particle }
   {
     elpair         .choice: ,
     elpair / false .code:n    =
-      { \bool_set_false:N \l_chemmacros_particle_elpair_bool } ,
+      { \bool_set_false:N \l__chemmacros_particle_elpair_bool } ,
     elpair / dots  .code:n    =
       {
-        \bool_set_true:N \l_chemmacros_particle_elpair_bool
-        \bool_set_true:N \l_chemmacros_elpair_dots_bool
+        \bool_set_true:N \l__chemmacros_particle_elpair_bool
+        \bool_set_true:N \l__chemmacros_elpair_dots_bool
       } ,
     elpair / dash  .code:n    =
       {
-        \bool_set_true:N \l_chemmacros_particle_elpair_bool
-        \bool_set_false:N \l_chemmacros_elpair_dots_bool
+        \bool_set_true:N \l__chemmacros_particle_elpair_bool
+        \bool_set_false:N \l__chemmacros_elpair_dots_bool
       } ,
     elpair         .default:n = dots
   }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % IUPAC
-\prop_new:N \l_chemmacros_iupac_prop
+\prop_new:N \l__chemmacros_iupac_prop
 
 \NewDocumentCommand \DeclareChemIUPAC { mm }
   {
-    \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
-    \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl }
-    \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl }
+    \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
+    \tl_set:Nf \l__chemmacros_tmpa_tl { \tl_tail:V \l__chemmacros_tmpa_tl }
+    \prop_if_in:NoTF \l__chemmacros_iupac_prop { \l__chemmacros_tmpa_tl }
       { \chemmacros_msg:nnxx { chemmacros } { declare-iupac } { #1 } { } }
-      { \prop_put:Non \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } { #2 } }
+      { \prop_put:Non \l__chemmacros_iupac_prop { \l__chemmacros_tmpa_tl } { #2 } }
     \chemmacros_make_iupac:
   }
 
 \NewDocumentCommand \RenewChemIUPAC { mm }
   {
-    \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
-    \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl }
-    \prop_if_in:NoTF \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl }
-      { \prop_put:Non \l_chemmacros_iupac_prop { \l_chemmacros_tmpa_tl } { #2 } }
+    \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
+    \tl_set:Nf \l__chemmacros_tmpa_tl { \tl_tail:V \l__chemmacros_tmpa_tl }
+    \prop_if_in:NoTF \l__chemmacros_iupac_prop { \l__chemmacros_tmpa_tl }
+      { \prop_put:Non \l__chemmacros_iupac_prop { \l__chemmacros_tmpa_tl } { #2 } }
       { \chemmacros_msg:nnxx { chemmacros } { renew-iupac } { #1 } { } }
     \chemmacros_make_iupac:
   }
 
 \cs_new_nopar:Npn \chemmacros_make_iupac:
   {
-    \bool_if:NT \l_chemmacros_in_document_bool
+    \bool_if:NT \l__chemmacros_in_document_bool
       {
-        \bool_if:NTF \l_chemmacros_inside_iupac_bool
+        \bool_if:NTF \l__chemmacros_inside_iupac_bool
           {
-            \prop_map_inline:Nn \l_chemmacros_iupac_prop
+            \prop_map_inline:Nn \l__chemmacros_iupac_prop
               { \cs_set_protected_nopar:cpn { ##1 } { ##2 } }
           }
           {
-            \bool_if:NF \l_chemmacros_iupac_restricted_bool
+            \bool_if:NF \l__chemmacros_iupac_restricted_bool
               {
-                \bool_if:NTF \l_chemmacros_iupac_strict_bool
+                \bool_if:NTF \l__chemmacros_iupac_strict_bool
                   {
-                    \prop_map_inline:Nn \l_chemmacros_iupac_prop
+                    \prop_map_inline:Nn \l__chemmacros_iupac_prop
                       { \cs_set_protected_nopar:cpn { ##1 } { ##2 } }
                   }
                   {
-                    \prop_map_inline:Nn \l_chemmacros_iupac_prop
+                    \prop_map_inline:Nn \l__chemmacros_iupac_prop
                       {
                         \cs_if_exist:cF { ##1 }
                           { \cs_set_protected_nopar:cpn { ##1 } { ##2 } }
@@ -1032,17 +1032,17 @@
 
 % stereo descriptors and other nomenclature commands
 % Cahn-Ingold-Prelog
-\dim_new:N \l_chemmacros_cip_kern_dim
-\dim_set:Nn \l_chemmacros_cip_kern_dim { .05ex }
+\dim_new:N \l__chemmacros_cip_kern_dim
+\dim_set:Nn \l__chemmacros_cip_kern_dim { .05ex }
 \keys_define:nn { chemmacros / iupac }
-  { cip-kern .dim_set:N = \l_chemmacros_cip_kern_dim }
+  { cip-kern .dim_set:N = \l__chemmacros_cip_kern_dim }
 
 \NewDocumentCommand \cip { m }
   {
     \cs_if_exist:NTF \EmbracOff
       { \textit* { (#1) } }
       { \textit { (#1) } }
-    \tex_kern:D \l_chemmacros_cip_kern_dim
+    \tex_kern:D \l__chemmacros_cip_kern_dim
   }
 
 \cs_new_protected_nopar:Npn \Rcip
@@ -1116,15 +1116,15 @@
 \DeclareChemIUPAC \anti { \textit { anti } }
 
 % coordination chemistry
-\bool_new:N \l_chemmacros_bridge_super_bool
+\bool_new:N \l__chemmacros_bridge_super_bool
 \keys_define:nn { chemmacros / iupac }
   {
     bridge-number         .choice: ,
     bridge-number / sub   .code:n     =
-      \bool_set_false:N \l_chemmacros_bridge_super_bool ,
+      \bool_set_false:N \l__chemmacros_bridge_super_bool ,
     bridge-number / super .code:n     =
-      \bool_set_true:N \l_chemmacros_bridge_super_bool ,
-    coord-use-hyphen      .bool_set:N = \l_chemmacros_coord_use_hyphen_bool ,
+      \bool_set_true:N \l__chemmacros_bridge_super_bool ,
+    coord-use-hyphen      .bool_set:N = \l__chemmacros_coord_use_hyphen_bool ,
     coord-use-hyphen      .default:n  = true
   }
 
@@ -1135,7 +1135,7 @@
   {
     \Chemmu \tl_if_blank:nF { #1 }
       {
-        \bool_if:NTF \l_chemmacros_bridge_super_bool
+        \bool_if:NTF \l__chemmacros_bridge_super_bool
           { \chemformula_superscript:n { #1 } }
           { \chemformula_subscript:n { #1 } }
       }
@@ -1155,7 +1155,7 @@
 % language specific settings
 \AtBeginDocument
   {
-    \bool_if:NT \l_chemmacros_italian_bool
+    \bool_if:NT \l__chemmacros_italian_bool
       {
         \DeclareChemIUPAC \sin  { \textit { sin } }
         \DeclareChemIUPAC \ter  { \textit { ter } }
@@ -1182,18 +1182,18 @@
 \cs_new_protected:Nn \chemmacros_allow_hyphens:
   { \tex_penalty:D \c_ten_thousand \skip_horizontal:n { \c_zero_dim } }
 
-\dim_new:N \l_chemmacros_iupac_hyphen_pre_dim
-\dim_set:Nn \l_chemmacros_iupac_hyphen_pre_dim { .01em }
-\dim_new:N \l_chemmacros_iupac_hyphen_post_dim
-\dim_set:Nn \l_chemmacros_iupac_hyphen_post_dim { -.03em }
-\dim_new:N \l_chemmacros_iupac_break_dim
-\dim_set:Nn \l_chemmacros_iupac_break_dim { .03em }
+\dim_new:N \l__chemmacros_iupac_hyphen_pre_dim
+\dim_set:Nn \l__chemmacros_iupac_hyphen_pre_dim { .01em }
+\dim_new:N \l__chemmacros_iupac_hyphen_post_dim
+\dim_set:Nn \l__chemmacros_iupac_hyphen_post_dim { -.03em }
+\dim_new:N \l__chemmacros_iupac_break_dim
+\dim_set:Nn \l__chemmacros_iupac_break_dim { .03em }
 
 \keys_define:nn { chemmacros / iupac }
   {
-    hyphen-pre-space  .dim_set:N = \l_chemmacros_iupac_hyphen_pre_dim ,
-    hyphen-post-space .dim_set:N = \l_chemmacros_iupac_hyphen_post_dim ,
-    break-space       .dim_set:N = \l_chemmacros_iupac_break_dim
+    hyphen-pre-space  .dim_set:N = \l__chemmacros_iupac_hyphen_pre_dim ,
+    hyphen-post-space .dim_set:N = \l__chemmacros_iupac_hyphen_post_dim ,
+    break-space       .dim_set:N = \l__chemmacros_iupac_break_dim
   }
 
 \cs_new_protected:Nn \chemmacros_break_point_hyphen:
@@ -1201,9 +1201,9 @@
     \tex_penalty:D \c_ten_thousand
     \tex_discretionary:D { - } { }
       {
-        \tex_kern:D \l_chemmacros_iupac_hyphen_pre_dim
+        \tex_kern:D \l__chemmacros_iupac_hyphen_pre_dim
         -
-        \tex_kern:D \l_chemmacros_iupac_hyphen_post_dim
+        \tex_kern:D \l__chemmacros_iupac_hyphen_post_dim
       }
     \chemmacros_allow_hyphens:
   }
@@ -1212,16 +1212,16 @@
   {
     \tex_penalty:D \c_ten_thousand
     \tex_discretionary:D { - } { }
-      { \tex_kern:D \l_chemmacros_iupac_break_dim }
+      { \tex_kern:D \l__chemmacros_iupac_break_dim }
     \chemmacros_allow_hyphens:
   }
 
-\bool_new:N \l_chemmacros_inside_iupac_bool
+\bool_new:N \l__chemmacros_inside_iupac_bool
 
 \cs_new_protected:Nn \chemmacros_iupac:n
   {
     \group_begin:
-      \bool_set_true:N \l_chemmacros_inside_iupac_bool
+      \bool_set_true:N \l__chemmacros_inside_iupac_bool
       \chemmacros_make_iupac:
       \chemmacros_ignore_spaces:
       \cs_set_eq:NN \- \chemmacros_break_point_hyphen:
@@ -1240,36 +1240,36 @@
 \cs_set_eq:NN \iupac \chemmacros_iupac:n
 
 % latin phrases
-\tl_new:N \l_chemmacros_latin_format_tl
-\tl_set:Nn \l_chemmacros_latin_format_tl { \itshape }
+\tl_new:N \l__chemmacros_latin_format_tl
+\tl_set:Nn \l__chemmacros_latin_format_tl { \itshape }
 
 \keys_define:nn { chemmacros / latin }
-  { format . tl_set:N = \l_chemmacros_latin_format_tl }
+  { format . tl_set:N = \l__chemmacros_latin_format_tl }
 
 \cs_new:Npn \chemmacros_latin:n #1
-  { { \l_chemmacros_latin_format_tl #1 } }
+  { { \l__chemmacros_latin_format_tl #1 } }
 
-\prop_new:N \l_chemmacros_latin_prop
+\prop_new:N \l__chemmacros_latin_prop
 \NewDocumentCommand \DeclareChemLatin { mm }
   {
     \cs_if_free:NTF #1
       {
         \cs_new:Npn #1 { \chemmacros_latin:n { #2 } \chemmacros_xspace: }
-        \prop_put:Nnn \l_chemmacros_latin_prop { #1 } { #2 }
+        \prop_put:Nnn \l__chemmacros_latin_prop { #1 } { #2 }
       }
       { \chemmacros_msg:nnxx { chemmacros } { declare-latin } { #1 } { }  }
   }
 
 \NewDocumentCommand \RenewChemLatin { mm }
   {
-    \prop_if_in:NnTF \l_chemmacros_latin_prop { #1 }
+    \prop_if_in:NnTF \l__chemmacros_latin_prop { #1 }
       { \cs_set:Npn #1 { \chemmacros_latin:n { #2 } \chemmacros_xspace: } }
       { \chemmacros_msg:nnxx { chemmacros } { renew-latin } { #1 } { }  }
   }
 
 \AtBeginDocument
   {
-    \bool_if:NTF \l_chemmacros_chemstyle_bool
+    \bool_if:NTF \l__chemmacros_chemstyle_bool
       {
         \AfterPackage* { chemstyle }
           {
@@ -1299,7 +1299,7 @@
 
 \cs_new_nopar:Npn \chemmacros_if_bold:TF #1#2
   {
-    \ifx\f@series\l_chemmacros_if_bf_tl
+    \ifx\f@series\l__chemmacros_if_bf_tl
       \expandafter\@firstoftwo
     \else
       \expandafter\@secondoftwo
@@ -1307,8 +1307,8 @@
     { #1 }{ #2 }
   }
 
-\tl_new:N \l_chemmacros_if_bf_tl
-\tl_set:Nn \l_chemmacros_if_bf_tl { bx }
+\tl_new:N \l__chemmacros_if_bf_tl
+\tl_set:Nn \l__chemmacros_if_bf_tl { bx }
 
 \cs_new_protected_nopar:Npn \Ka
   {
@@ -1318,7 +1318,7 @@
           \chemmacros_detect_bold:n
             {
               K \c_math_subscript_token \mathrm
-                { \bool_if:NTF \l_chemmacros_german_bool { S } { A } }
+                { \bool_if:NTF \l__chemmacros_german_bool { S } { A } }
             }
         \)
       }
@@ -1391,7 +1391,7 @@
 \DeclareSIUnit { \cal        } { cal }
 \AtBeginDocument
   {
-    \bool_if:NF \l_chemmacros_chemstyle_bool
+    \bool_if:NF \l__chemmacros_chemstyle_bool
       {
         \DeclareSIUnit { \cmc   } { \cubic\centi\metre }
         \DeclareSIUnit { \molar } { \mole\per\cubic\deci\metre }
@@ -1408,15 +1408,15 @@
 % \mech[<type>]
 % <type> - substitutions: {}, 1, 2, se, 1e, 2e, ar
 %        - eliminations:  e, e1, e2, cb
-\tl_new:N \l_chemmacros_mech_type_tl
-\tl_new:N \l_chemmacros_mech_mol_tl
-\tl_new:N \l_chemmacros_mech_ar_tl
+\tl_new:N \l__chemmacros_mech_type_tl
+\tl_new:N \l__chemmacros_mech_mol_tl
+\tl_new:N \l__chemmacros_mech_ar_tl
 
 \cs_new_nopar:Npn \chemmacros_set_mech:nnn #1#2#3
   {
-    \tl_set:Nn \l_chemmacros_mech_type_tl { #1 }
-    \tl_set:Nn \l_chemmacros_mech_mol_tl  { #2 }
-    \tl_set:Nn \l_chemmacros_mech_ar_tl   { #3 }
+    \tl_set:Nn \l__chemmacros_mech_type_tl { #1 }
+    \tl_set:Nn \l__chemmacros_mech_mol_tl  { #2 }
+    \tl_set:Nn \l__chemmacros_mech_ar_tl   { #3 }
   }
 
 \keys_define:nn { chemmacros / mech }
@@ -1478,9 +1478,9 @@
       { \keys_set:nn { chemmacros / mech } { type = #1 } }
       \mbox
         {
-          \tl_use:N \l_chemmacros_mech_ar_tl
-          \tl_use:N \l_chemmacros_mech_type_tl
-          \tl_use:N \l_chemmacros_mech_mol_tl
+          \tl_use:N \l__chemmacros_mech_ar_tl
+          \tl_use:N \l__chemmacros_mech_type_tl
+          \tl_use:N \l__chemmacros_mech_mol_tl
         }
     \chemmacros_xspace:
   }
@@ -1488,33 +1488,33 @@
 % --------------------------------------------------------------------------- %
 % oxidation numbers
 % \ox{<number>,<atom>}
-\bool_new:N \l_chemmacros_ox_sign_bool
-\bool_new:N \l_chemmacros_ox_integer_bool
+\bool_new:N \l__chemmacros_ox_sign_bool
+\bool_new:N \l__chemmacros_ox_integer_bool
 
-\bool_new:N \l_chemmacros_ox_explicit_sign_bool
-\bool_set_false:N \l_chemmacros_ox_explicit_sign_bool
+\bool_new:N \l__chemmacros_ox_explicit_sign_bool
+\bool_set_false:N \l__chemmacros_ox_explicit_sign_bool
 
-\bool_new:N \l_chemmacros_ox_format_roman_bool
-\bool_set_true:N \l_chemmacros_ox_format_roman_bool
+\bool_new:N \l__chemmacros_ox_format_roman_bool
+\bool_set_true:N \l__chemmacros_ox_format_roman_bool
 
-\bool_new:N \l_chemmacros_ox_decimal_marker_comma_bool
-\bool_set_false:N \l_chemmacros_ox_decimal_marker_comma_bool
+\bool_new:N \l__chemmacros_ox_decimal_marker_comma_bool
+\bool_set_false:N \l__chemmacros_ox_decimal_marker_comma_bool
 
-\bool_new:N \l_chemmacros_ox_parse_bool
-\bool_set_true:N \l_chemmacros_ox_parse_bool
+\bool_new:N \l__chemmacros_ox_parse_bool
+\bool_set_true:N \l__chemmacros_ox_parse_bool
 
-\int_new:N \l_chemmacros_ox_number_int
-\fp_new:N \l_chemmacros_ox_number_fp
+\int_new:N \l__chemmacros_ox_number_int
+\fp_new:N \l__chemmacros_ox_number_fp
 
-\bool_new:N \l_chemmacros_ox_side_bool
-\bool_new:N \l_chemmacros_ox_super_bool
-\bool_new:N \l_chemmacros_ox_top_bool
-\bool_set_true:N \l_chemmacros_ox_top_bool
-\bool_new:N \l_chemmacros_ox_align_center_bool
+\bool_new:N \l__chemmacros_ox_side_bool
+\bool_new:N \l__chemmacros_ox_super_bool
+\bool_new:N \l__chemmacros_ox_top_bool
+\bool_set_true:N \l__chemmacros_ox_top_bool
+\bool_new:N \l__chemmacros_ox_align_center_bool
 
 \cs_new_nopar:Npn \chemmacros_ox_process_number:n #1
   {
-    \bool_if:NTF \l_chemmacros_ox_parse_bool
+    \bool_if:NTF \l__chemmacros_ox_parse_bool
       {
         \tl_if_in:nnTF { #1 } { / }
           { \chemmacros_ox_fraction:n #1 }
@@ -1538,9 +1538,9 @@
 
 \cs_new_nopar:Npn \chemmacros_ox_fraction:n #1/#2
   {
-    \bool_set_false:N \l_chemmacros_ox_format_roman_bool
+    \bool_set_false:N \l__chemmacros_ox_format_roman_bool
     \chemmacros_ox_sign:n { #1 }
-    \bool_if:NTF \l_chemmacros_ox_side_bool
+    \bool_if:NTF \l__chemmacros_ox_side_bool
       { \sfrac { \chemmacros_ox_value:n { #1 } } { #2 } }
       { \sfrac [ chemmacros-ox-frac ] { \chemmacros_ox_value:n { #1 } } { #2 } }
   }
@@ -1548,40 +1548,40 @@
 \cs_new_nopar:Npn \chemmacros_ox_sign:n #1
   {
     \fp_compare:nNnT { #1 } > { 0 }
-      { \bool_if:NT \l_chemmacros_ox_explicit_sign_bool { $+$ } }
+      { \bool_if:NT \l__chemmacros_ox_explicit_sign_bool { $+$ } }
     \fp_compare:nNnT { #1 } = { 0 }
-      { \bool_if:NT \l_chemmacros_ox_explicit_sign_bool { $\pm$ } }
+      { \bool_if:NT \l__chemmacros_ox_explicit_sign_bool { $\pm$ } }
     \fp_compare:nNnT { #1 } < { 0 }
       { $-$ }
   }
 
 \cs_new_nopar:Npn \chemmacros_ox_value:n #1
   {
-    \fp_set:Nn \l_chemmacros_ox_number_fp { #1 }
-    \fp_abs:N \l_chemmacros_ox_number_fp
-    \chemmacros_ox_is_integer:N \l_chemmacros_ox_number_fp
-    \bool_if:NTF \l_chemmacros_ox_format_roman_bool
+    \fp_set:Nn \l__chemmacros_ox_number_fp { #1 }
+    \fp_abs:N \l__chemmacros_ox_number_fp
+    \chemmacros_ox_is_integer:N \l__chemmacros_ox_number_fp
+    \bool_if:NTF \l__chemmacros_ox_format_roman_bool
       {
-        \chemmacros_fp_to_Roman:N \l_chemmacros_ox_number_fp
+        \chemmacros_fp_to_Roman:N \l__chemmacros_ox_number_fp
       }
       {
-        \bool_if:NTF \l_chemmacros_ox_integer_bool
-          { \chemmacros_fp_to_arabic:N \l_chemmacros_ox_number_fp }
-          { \chemmacros_fp_show:N \l_chemmacros_ox_number_fp }
+        \bool_if:NTF \l__chemmacros_ox_integer_bool
+          { \chemmacros_fp_to_arabic:N \l__chemmacros_ox_number_fp }
+          { \chemmacros_fp_show:N \l__chemmacros_ox_number_fp }
       }
   }
 
 \cs_new_nopar:Npn \chemmacros_ox_is_integer:n #1
   {
-    \fp_set:Nn \l_chemmacros_tmpa_tl { #1 }
-    \fp_add:Nn \l_chemmacros_tmpa_tl { 1 }
-    \fp_round_places:Nn \l_chemmacros_tmpa_tl { 0 }
-    \fp_sub:Nn \l_chemmacros_tmpa_tl { 1 }
-    \fp_compare:nNnTF { \l_chemmacros_tmpa_tl } = { #1 }
-      { \bool_set_true:N \l_chemmacros_ox_integer_bool }
+    \fp_set:Nn \l__chemmacros_tmpa_tl { #1 }
+    \fp_add:Nn \l__chemmacros_tmpa_tl { 1 }
+    \fp_round_places:Nn \l__chemmacros_tmpa_tl { 0 }
+    \fp_sub:Nn \l__chemmacros_tmpa_tl { 1 }
+    \fp_compare:nNnTF { \l__chemmacros_tmpa_tl } = { #1 }
+      { \bool_set_true:N \l__chemmacros_ox_integer_bool }
       {
-        \bool_set_false:N \l_chemmacros_ox_integer_bool
-        \bool_set_false:N \l_chemmacros_ox_format_roman_bool
+        \bool_set_false:N \l__chemmacros_ox_integer_bool
+        \bool_set_false:N \l__chemmacros_ox_format_roman_bool
       }
   }
 \cs_generate_variant:Nn \chemmacros_ox_is_integer:n { N }
@@ -1589,12 +1589,12 @@
 \cs_new_nopar:Npn \chemmacros_fp_to_Roman:n #1
   {
     \group_begin:
-      \fp_set:Nn \l_chemmacros_tmpa_tl { #1 }
-      \fp_round_places:Nn \l_chemmacros_tmpa_tl { 0 }
-      \int_set:Nn \l_chemmacros_tmpa_int { \fp_to_tl:N \l_chemmacros_tmpa_tl }
-      \int_compare:nTF { \l_chemmacros_tmpa_int = 0 }
+      \fp_set:Nn \l__chemmacros_tmpa_tl { #1 }
+      \fp_round_places:Nn \l__chemmacros_tmpa_tl { 0 }
+      \int_set:Nn \l__chemmacros_tmpa_int { \fp_to_tl:N \l__chemmacros_tmpa_tl }
+      \int_compare:nTF { \l__chemmacros_tmpa_int = 0 }
         { 0 }
-        { \int_to_Roman:n { \int_use:N \l_chemmacros_tmpa_int } }
+        { \int_to_Roman:n { \int_use:N \l__chemmacros_tmpa_int } }
     \group_end:
   }
 \cs_generate_variant:Nn \chemmacros_fp_to_Roman:n { N }
@@ -1602,8 +1602,8 @@
 \cs_new_nopar:Npn \chemmacros_fp_to_arabic:n #1
   {
     \group_begin:
-      \fp_set:Nn \l_chemmacros_tmpa_tl { #1 }
-      \fp_to_tl:N \l_chemmacros_tmpa_tl
+      \fp_set:Nn \l__chemmacros_tmpa_tl { #1 }
+      \fp_to_tl:N \l__chemmacros_tmpa_tl
     \group_end:
   }
 \cs_generate_variant:Nn \chemmacros_fp_to_arabic:n { N }
@@ -1611,14 +1611,14 @@
 \cs_new_nopar:Npn \chemmacros_fp_show:n #1
   {
     \group_begin:
-      \fp_set:Nn \l_chemmacros_tmpa_tl { #1 }
-      \bool_if:NTF \l_chemmacros_ox_decimal_marker_comma_bool
+      \fp_set:Nn \l__chemmacros_tmpa_tl { #1 }
+      \bool_if:NTF \l__chemmacros_ox_decimal_marker_comma_bool
         {
-          \tl_set:Nx \l_chemmacros_tmpb_tl { \fp_to_tl:N \l_chemmacros_tmpa_tl }
-          \tl_replace_once:Nnn \l_chemmacros_tmpb_tl { . } { {,} }
-          \tl_use:N \l_chemmacros_tmpb_tl
+          \tl_set:Nx \l__chemmacros_tmpb_tl { \fp_to_tl:N \l__chemmacros_tmpa_tl }
+          \tl_replace_once:Nnn \l__chemmacros_tmpb_tl { . } { {,} }
+          \tl_use:N \l__chemmacros_tmpb_tl
         }
-        { \fp_to_tl:N \l_chemmacros_tmpa_tl }
+        { \fp_to_tl:N \l__chemmacros_tmpa_tl }
     \group_end:
   }
 \cs_generate_variant:Nn \chemmacros_fp_show:n { N }
@@ -1635,7 +1635,7 @@
       }
     \ensuremath
       {
-        \bool_if:NT \l_chemmacros_ox_super_bool
+        \bool_if:NT \l__chemmacros_ox_super_bool
           {
             \chemmacros_text:n
               {
@@ -1643,16 +1643,16 @@
                 $ ^ { \text { \tiny \chemmacros_ox_process_number:n { #1 } } } $
               }
           }
-        \bool_if:NT \l_chemmacros_ox_side_bool
+        \bool_if:NT \l__chemmacros_ox_side_bool
           {
             \chemmacros_text:n
               { #2 ( \text { \chemmacros_ox_process_number:n { #1 } } ) }
           }
-        \bool_if:NT \l_chemmacros_ox_top_bool
+        \bool_if:NT \l__chemmacros_ox_top_bool
           {
             \overset
               {
-                \bool_if:NTF \l_chemmacros_ox_align_center_bool
+                \bool_if:NTF \l__chemmacros_ox_align_center_bool
                   { \clap } { \rlap }
                 {
                   \chemmacros_text:n
@@ -1666,23 +1666,23 @@
 
 \cs_new_nopar:Npn \chemmacros_ox_pos_top:
   {
-    \bool_set_true:N  \l_chemmacros_ox_top_bool
-    \bool_set_false:N \l_chemmacros_ox_super_bool
-    \bool_set_false:N \l_chemmacros_ox_side_bool
+    \bool_set_true:N  \l__chemmacros_ox_top_bool
+    \bool_set_false:N \l__chemmacros_ox_super_bool
+    \bool_set_false:N \l__chemmacros_ox_side_bool
   }
 
 \cs_new_nopar:Npn \chemmacros_ox_pos_super:
   {
-    \bool_set_false:N \l_chemmacros_ox_top_bool
-    \bool_set_true:N  \l_chemmacros_ox_super_bool
-    \bool_set_false:N \l_chemmacros_ox_side_bool
+    \bool_set_false:N \l__chemmacros_ox_top_bool
+    \bool_set_true:N  \l__chemmacros_ox_super_bool
+    \bool_set_false:N \l__chemmacros_ox_side_bool
   }
 
 \cs_new_nopar:Npn \chemmacros_ox_pos_side:
   {
-    \bool_set_false:N \l_chemmacros_ox_top_bool
-    \bool_set_false:N \l_chemmacros_ox_super_bool
-    \bool_set_true:N  \l_chemmacros_ox_side_bool
+    \bool_set_false:N \l__chemmacros_ox_top_bool
+    \bool_set_false:N \l__chemmacros_ox_super_bool
+    \bool_set_true:N  \l__chemmacros_ox_side_bool
   }
 
 \keys_define:nn { chemmacros / ox }
@@ -1691,20 +1691,20 @@
     pos / top      .code:n     = \chemmacros_ox_pos_top: ,
     pos / super    .code:n     = \chemmacros_ox_pos_super: ,
     pos / side     .code:n     = \chemmacros_ox_pos_side: ,
-    roman          .bool_set:N = \l_chemmacros_ox_format_roman_bool ,
+    roman          .bool_set:N = \l__chemmacros_ox_format_roman_bool ,
     roman          .default:n  = true ,
-    parse          .bool_set:N = \l_chemmacros_ox_parse_bool ,
+    parse          .bool_set:N = \l__chemmacros_ox_parse_bool ,
     parse          .default:n  = true ,
-    explicit-sign  .bool_set:N = \l_chemmacros_ox_explicit_sign_bool ,
+    explicit-sign  .bool_set:N = \l__chemmacros_ox_explicit_sign_bool ,
     explicit-sign  .default:n  = true ,
     decimal-marker .choice: ,
     decimal-marker / comma .code:n =
-      { \bool_set_true:N \l_chemmacros_ox_decimal_marker_comma_bool } ,
+      { \bool_set_true:N \l__chemmacros_ox_decimal_marker_comma_bool } ,
     decimal-marker / point .code:n =
-      { \bool_set_false:N \l_chemmacros_ox_decimal_marker_comma_bool } ,
+      { \bool_set_false:N \l__chemmacros_ox_decimal_marker_comma_bool } ,
     align          .choice: ,
-    align / center .code:n    = \bool_set_true:N \l_chemmacros_ox_align_center_bool ,
-    align / right  .code:n    = \bool_set_false:N \l_chemmacros_ox_align_center_bool
+    align / center .code:n    = \bool_set_true:N \l__chemmacros_ox_align_center_bool ,
+    align / right  .code:n    = \bool_set_false:N \l__chemmacros_ox_align_center_bool
   }
 
 % \ox[<keyval>]{<num>,<atom>}
@@ -1713,7 +1713,7 @@
   {
     \group_begin:
       \IfBooleanT { #1 } { \chemmacros_ox_pos_super: }
-      \bool_if:NTF \l_chemmacros_version_one_bool
+      \bool_if:NTF \l__chemmacros_version_one_bool
         { \keys_set:nn { chemmacros / ox } { parse = false } }
         { \IfNoValueF { #2 } { \keys_set:nn { chemmacros / ox } { #2 } } }
       \chemmacros_ox:nn #3
@@ -1722,24 +1722,24 @@
 
 % --------------------------------------------------------------------------- %
 % - oxidation arrows
-\tl_new:N \l_chemmacros_redox_begin_tl
-\tl_new:N \l_chemmacros_redox_end_tl
+\tl_new:N \l__chemmacros_redox_begin_tl
+\tl_new:N \l__chemmacros_redox_end_tl
 
-\tl_new:N \l_chemmacros_redox_tikz_tl
+\tl_new:N \l__chemmacros_redox_tikz_tl
 
-\fp_new:N \l_chemmacros_redox_shift_fp
-\tl_new:N \l_chemmacros_redox_shift_tl
+\fp_new:N \l__chemmacros_redox_shift_fp
+\tl_new:N \l__chemmacros_redox_shift_tl
 
-\tl_new:N \l_chemmacros_redox_anchor_tl
+\tl_new:N \l__chemmacros_redox_anchor_tl
 
-\tl_new:N \l_chemmacros_redox_side_tl
+\tl_new:N \l__chemmacros_redox_side_tl
 
-\dim_new:N \l_chemmacros_redox_sep_dim
-\dim_new:N \l_chemmacros_redox_sep_default_dim
-\dim_set:Nn \l_chemmacros_redox_sep_default_dim { .2em }
+\dim_new:N \l__chemmacros_redox_sep_dim
+\dim_new:N \l__chemmacros_redox_sep_default_dim
+\dim_set:Nn \l__chemmacros_redox_sep_default_dim { .2em }
 
-\dim_new:N \l_chemmacros_redox_dist_dim
-\dim_set:Nn \l_chemmacros_redox_dist_dim {.6em}
+\dim_new:N \l__chemmacros_redox_dist_dim
+\dim_set:Nn \l__chemmacros_redox_dist_dim {.6em}
 
 % place and name nodes:
 % \OX{<name>,<atom>}
@@ -1764,8 +1764,8 @@
 
 \cs_new_nopar:Npn \chemmacros_redox_coordinates:nn #1#2
   {
-    \tl_set:Nn \l_chemmacros_redox_begin_tl { #1 }
-    \tl_set:Nn \l_chemmacros_redox_end_tl { #2 }
+    \tl_set:Nn \l__chemmacros_redox_begin_tl { #1 }
+    \tl_set:Nn \l__chemmacros_redox_end_tl { #2 }
   }
 
 \NewDocumentCommand \redox { > { \SplitArgument { 1 } { , } } r() o o G{} }
@@ -1775,53 +1775,53 @@
         \msg_error:nnx { chemmacros } { redox }
           { You~need~to~specify~coordinates }
       }
-    \tl_clear:N \l_chemmacros_redox_begin_tl
-    \tl_clear:N \l_chemmacros_redox_end_tl
-    \tl_clear:N \l_chemmacros_redox_tikz_tl
+    \tl_clear:N \l__chemmacros_redox_begin_tl
+    \tl_clear:N \l__chemmacros_redox_end_tl
+    \tl_clear:N \l__chemmacros_redox_tikz_tl
     \chemmacros_redox_coordinates:nn #1
     \IfNoValueF { #2 }
-      { \tl_set:Nn \l_chemmacros_redox_tikz_tl { #2 } }
+      { \tl_set:Nn \l__chemmacros_redox_tikz_tl { #2 } }
     \IfNoValueTF { #3 }
       {
-        \fp_set:Nn \l_chemmacros_redox_shift_fp  { 1 }
-        \tl_set:Nn \l_chemmacros_redox_anchor_tl { above }
-        \tl_set:Nn \l_chemmacros_redox_side_tl { north }
+        \fp_set:Nn \l__chemmacros_redox_shift_fp  { 1 }
+        \tl_set:Nn \l__chemmacros_redox_anchor_tl { above }
+        \tl_set:Nn \l__chemmacros_redox_side_tl { north }
         \dim_set_eq:NN
-          \l_chemmacros_redox_sep_dim
-          \l_chemmacros_redox_sep_default_dim
+          \l__chemmacros_redox_sep_dim
+          \l__chemmacros_redox_sep_default_dim
       }
       {
         \fp_compare:nNnTF { #3 } < { 0 }
           {
-            \tl_set:Nn \l_chemmacros_redox_anchor_tl { below }
-            \tl_set:Nn \l_chemmacros_redox_side_tl { south }
-            \exp_args:NNo \dim_set:Nn \l_chemmacros_redox_sep_dim
-              { - \l_chemmacros_redox_sep_default_dim }
+            \tl_set:Nn \l__chemmacros_redox_anchor_tl { below }
+            \tl_set:Nn \l__chemmacros_redox_side_tl { south }
+            \exp_args:NNo \dim_set:Nn \l__chemmacros_redox_sep_dim
+              { - \l__chemmacros_redox_sep_default_dim }
           }
           {
-            \tl_set:Nn \l_chemmacros_redox_anchor_tl { above }
-            \tl_set:Nn \l_chemmacros_redox_side_tl { north }
+            \tl_set:Nn \l__chemmacros_redox_anchor_tl { above }
+            \tl_set:Nn \l__chemmacros_redox_side_tl { north }
             \dim_set_eq:NN
-              \l_chemmacros_redox_sep_dim
-              \l_chemmacros_redox_sep_default_dim
+              \l__chemmacros_redox_sep_dim
+              \l__chemmacros_redox_sep_default_dim
           }
-        \fp_set:Nn \l_chemmacros_redox_shift_fp { #3 }
+        \fp_set:Nn \l__chemmacros_redox_shift_fp { #3 }
       }
-      \tl_set:Nn \l_chemmacros_redox_shift_tl
-        { \fp_to_tl:N \l_chemmacros_redox_shift_fp }
+      \tl_set:Nn \l__chemmacros_redox_shift_tl
+        { \fp_to_tl:N \l__chemmacros_redox_shift_fp }
     \tikz[remember~picture,overlay]
       {
-        \chemmacros_tikz_draw:f { \tl_use:N \l_chemmacros_redox_tikz_tl }
+        \chemmacros_tikz_draw:f { \tl_use:N \l__chemmacros_redox_tikz_tl }
         ($
-          (\l_chemmacros_redox_begin_tl .
-          \l_chemmacros_redox_side_tl)+(0,\l_chemmacros_redox_sep_dim)
+          (\l__chemmacros_redox_begin_tl .
+          \l__chemmacros_redox_side_tl)+(0,\l__chemmacros_redox_sep_dim)
         $)
         -- 
-        ++(0,\l_chemmacros_redox_shift_tl * \l_chemmacros_redox_dist_dim) -|
-        node [pos=.25,\l_chemmacros_redox_anchor_tl] { { #4 } }
+        ++(0,\l__chemmacros_redox_shift_tl * \l__chemmacros_redox_dist_dim) -|
+        node [pos=.25,\l__chemmacros_redox_anchor_tl] { { #4 } }
         ($
-          (\l_chemmacros_redox_end_tl .
-          \l_chemmacros_redox_side_tl)+(0,\l_chemmacros_redox_sep_dim)
+          (\l__chemmacros_redox_end_tl .
+          \l__chemmacros_redox_side_tl)+(0,\l__chemmacros_redox_sep_dim)
         $) ;
       }
   }
@@ -1829,107 +1829,107 @@
 % redox-keys
 \keys_define:nn { chemmacros / redox }
   {
-    dist .dim_set:N = \l_chemmacros_redox_dist_dim ,
+    dist .dim_set:N = \l__chemmacros_redox_dist_dim ,
     dist .default:n = { .6em } ,
-    sep  .dim_set:N = \l_chemmacros_redox_sep_default_dim ,
+    sep  .dim_set:N = \l__chemmacros_redox_sep_default_dim ,
     sep  .default:n = { .2em }
   }
 
-\bool_if:NT \l_chemmacros_version_one_bool
+\bool_if:NT \l__chemmacros_version_one_bool
   {
     \NewDocumentCommand \setredoxdist { m }
       {
         \tl_if_blank:nTF { #1 }
-          { \dim_set:Nn \l_chemmacros_redox_dist_dim { .6em } }
-          { \dim_set:Nn \l_chemmacros_redox_dist_dim { #1 } }
+          { \dim_set:Nn \l__chemmacros_redox_dist_dim { .6em } }
+          { \dim_set:Nn \l__chemmacros_redox_dist_dim { #1 } }
       }
   }
 
 % --------------------------------------------------------------------------- %
 % spectroscopy
-\tl_new:N \g_chemmacros_nmr_isotope_tl
-\tl_new:N \l_chemmacros_nmr_isotope_default_tl
-\tl_set:Nn \l_chemmacros_nmr_isotope_default_tl { 1 }
-
-\tl_new:N \l_chemmacros_nmr_coupling_nuclei_tl
-\tl_new:N \l_chemmacros_nmr_coupling_bonds_tl
-\tl_new:N \g_chemmacros_nmr_element_coupled_tl
-
-\tl_new:N \g_chemmacros_nmr_element_tl
-\tl_new:N \l_chemmacros_nmr_element_default_tl
-\tl_set:Nn \l_chemmacros_nmr_element_default_tl { H }
-\tl_new:N \l_chemmacros_nmr_format_tl
-\tl_new:N \l_chemmacros_nmr_delta_tl
-\tl_new:N \l_chemmacros_nmr_coupling_unit_tl
-\tl_set:Nn \l_chemmacros_nmr_coupling_unit_tl { \hertz }
-\tl_new:N \l_chemmacros_nmr_list_setup_tl
-\tl_set:Nn \l_chemmacros_nmr_list_setup_tl
+\tl_new:N \g__chemmacros_nmr_isotope_tl
+\tl_new:N \l__chemmacros_nmr_isotope_default_tl
+\tl_set:Nn \l__chemmacros_nmr_isotope_default_tl { 1 }
+
+\tl_new:N \l__chemmacros_nmr_coupling_nuclei_tl
+\tl_new:N \l__chemmacros_nmr_coupling_bonds_tl
+\tl_new:N \g__chemmacros_nmr_element_coupled_tl
+
+\tl_new:N \g__chemmacros_nmr_element_tl
+\tl_new:N \l__chemmacros_nmr_element_default_tl
+\tl_set:Nn \l__chemmacros_nmr_element_default_tl { H }
+\tl_new:N \l__chemmacros_nmr_format_tl
+\tl_new:N \l__chemmacros_nmr_delta_tl
+\tl_new:N \l__chemmacros_nmr_coupling_unit_tl
+\tl_set:Nn \l__chemmacros_nmr_coupling_unit_tl { \hertz }
+\tl_new:N \l__chemmacros_nmr_list_setup_tl
+\tl_set:Nn \l__chemmacros_nmr_list_setup_tl
   {
     \topsep\z@skip \partopsep\z@skip 
     \itemsep\z@ \parsep\z@ \itemindent\z@
     \leftmargin\z@
   }
 
-\bool_new:N \l_chemmacros_nmr_frequency_bool
-\bool_new:N \l_chemmacros_nmr_solvent_bool
-\bool_new:N \l_chemmacros_nmr_delimiters_bool
-\bool_new:N \l_chemmacros_nmr_comma_bool
-\bool_new:N \l_chemmacros_nmr_inner_bool
-\bool_new:N \l_chemmacros_nmr_position_sub_bool
-\bool_new:N \l_chemmacros_nmr_parse_bool
-\bool_set_true:N \l_chemmacros_nmr_parse_bool
-\bool_new:N \l_chemmacros_nmr_list_bool
-% \bool_set_true:N \l_chemmacros_nmr_list_bool
-\bool_new:N \l_chemmacros_nmr_use_equal_bool
-% \bool_set_true:N \l_chemmacros_nmr_use_equal_bool
-\bool_new:N \l_chemmacros_nmr_custom_command_active_bool
-\bool_new:N \l_chemmacros_nmr_custom_command_used_bool
-
-\tl_new:N \l_chemmacros_nmr_unit_tl
-\tl_set:Nn \l_chemmacros_nmr_unit_tl { \mega\hertz }
+\bool_new:N \l__chemmacros_nmr_frequency_bool
+\bool_new:N \l__chemmacros_nmr_solvent_bool
+\bool_new:N \l__chemmacros_nmr_delimiters_bool
+\bool_new:N \l__chemmacros_nmr_comma_bool
+\bool_new:N \l__chemmacros_nmr_inner_bool
+\bool_new:N \l__chemmacros_nmr_position_sub_bool
+\bool_new:N \l__chemmacros_nmr_parse_bool
+\bool_set_true:N \l__chemmacros_nmr_parse_bool
+\bool_new:N \l__chemmacros_nmr_list_bool
+% \bool_set_true:N \l__chemmacros_nmr_list_bool
+\bool_new:N \l__chemmacros_nmr_use_equal_bool
+% \bool_set_true:N \l__chemmacros_nmr_use_equal_bool
+\bool_new:N \l__chemmacros_nmr_custom_command_active_bool
+\bool_new:N \l__chemmacros_nmr_custom_command_used_bool
+
+\tl_new:N \l__chemmacros_nmr_unit_tl
+\tl_set:Nn \l__chemmacros_nmr_unit_tl { \mega\hertz }
 
 \cs_new_nopar:Npn \chemmacros_nmr_nucleus:w #1,#2 \q_stop
   {
-    \tl_gset:Nn \g_chemmacros_nmr_isotope_tl { #1 }
+    \tl_gset:Nn \g__chemmacros_nmr_isotope_tl { #1 }
     \tl_if_in:nnTF { #2 } { [ }
       { \chemmacros_nmr_element:w #2 \q_stop }
       {
-        \tl_gset:No \g_chemmacros_nmr_element_tl { #2 }
-        \tl_gclear:N \g_chemmacros_nmr_element_coupled_tl
+        \tl_gset:No \g__chemmacros_nmr_element_tl { #2 }
+        \tl_gclear:N \g__chemmacros_nmr_element_coupled_tl
       }
   }
 
 \cs_new_nopar:Npn \chemmacros_nmr_element:w #1[#2] \q_stop
   {
-    \tl_gset:Nn \g_chemmacros_nmr_element_tl { #1 }
-    \tl_gset:Nn \g_chemmacros_nmr_element_coupled_tl { #2 }
+    \tl_gset:Nn \g__chemmacros_nmr_element_tl { #1 }
+    \tl_gset:Nn \g__chemmacros_nmr_element_coupled_tl { #2 }
   }
 
 \cs_new:Npn \chemmacros_nmr_default_nucleus:w #1,#2 \q_stop
   {
-    \tl_set:Nn \l_chemmacros_nmr_isotope_default_tl { #1 }
-    \tl_set:Nn \l_chemmacros_nmr_element_default_tl { #2 }
+    \tl_set:Nn \l__chemmacros_nmr_isotope_default_tl { #1 }
+    \tl_set:Nn \l__chemmacros_nmr_element_default_tl { #2 }
   }
 
 \cs_new_nopar:Npn \chemmacros_nmr_base:nn #1#2
   {
-    \tl_if_blank:VF \g_chemmacros_nmr_element_coupled_tl
+    \tl_if_blank:VF \g__chemmacros_nmr_element_coupled_tl
       {
-        \tl_put_left:Nn \g_chemmacros_nmr_element_coupled_tl { \{ }
-        \tl_put_right:Nn \g_chemmacros_nmr_element_coupled_tl { \} }
+        \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl { \{ }
+        \tl_put_right:Nn \g__chemmacros_nmr_element_coupled_tl { \} }
       }
-    \tl_put_left:Nn \g_chemmacros_nmr_element_coupled_tl { #2 }
-    \bool_if:NTF \l_chemmacros_bpchem_bool
-      { \IUPAC { \^ { #1 } \g_chemmacros_nmr_element_coupled_tl - NMR } }
+    \tl_put_left:Nn \g__chemmacros_nmr_element_coupled_tl { #2 }
+    \bool_if:NTF \l__chemmacros_bpchem_bool
+      { \IUPAC { \^ { #1 } \g__chemmacros_nmr_element_coupled_tl - NMR } }
       {
         \iupac { \^ { #1 } }
-        \bool_if:NTF \l_chemmacros_nmr_parse_bool
+        \bool_if:NTF \l__chemmacros_nmr_parse_bool
           {
-            \bool_if:NTF \l_chemmacros_use_mhchem_bool
-              { \exp_args:No \ce { \g_chemmacros_nmr_element_coupled_tl } }
-              { \exp_args:No \ch { \g_chemmacros_nmr_element_coupled_tl } }
+            \bool_if:NTF \l__chemmacros_use_mhchem_bool
+              { \exp_args:No \ce { \g__chemmacros_nmr_element_coupled_tl } }
+              { \exp_args:No \ch { \g__chemmacros_nmr_element_coupled_tl } }
           }
-          { \chemmacros_atom:V \g_chemmacros_nmr_element_coupled_tl }
+          { \chemmacros_atom:V \g__chemmacros_nmr_element_coupled_tl }
         - NMR
       }
   }
@@ -1944,40 +1944,40 @@
 \cs_new_nopar:Npn \chemmacros_nmr_frequency_aux_i:w #1,#2 \q_stop
   { \SI { #1 } { #2 } }
 \cs_new_nopar:Npn \chemmacros_nmr_frequency_aux_ii:n #1
-  { \SI { #1 } { \tl_use:N \l_chemmacros_nmr_unit_tl } }
+  { \SI { #1 } { \tl_use:N \l__chemmacros_nmr_unit_tl } }
 
 \keys_define:nn { chemmacros / nmr }
   {
-    unit       .tl_set:N      = \l_chemmacros_nmr_unit_tl ,
+    unit       .tl_set:N      = \l__chemmacros_nmr_unit_tl ,
     unit       .default:n     = \mega\hertz ,
     nucleus    .code:n        =
       { \chemmacros_nmr_default_nucleus:w #1 \q_stop } ,
     nucleus    .default:n     = { 1,H } ,
-    format     .tl_set:N      = \l_chemmacros_nmr_format_tl ,
+    format     .tl_set:N      = \l__chemmacros_nmr_format_tl ,
     pos-number .choice: ,
     pos-number / sub  .code:n =
-      \bool_set_true:N \l_chemmacros_nmr_position_sub_bool ,
+      \bool_set_true:N \l__chemmacros_nmr_position_sub_bool ,
     pos-number / side .code:n =
-      \bool_set_false:N \l_chemmacros_nmr_position_sub_bool ,
-    coupling-unit .tl_set:N   = \l_chemmacros_nmr_coupling_unit_tl ,
-    parse      .bool_set:N    = \l_chemmacros_nmr_parse_bool ,
+      \bool_set_false:N \l__chemmacros_nmr_position_sub_bool ,
+    coupling-unit .tl_set:N   = \l__chemmacros_nmr_coupling_unit_tl ,
+    parse      .bool_set:N    = \l__chemmacros_nmr_parse_bool ,
     delta      .code:n        =
-      \tl_set:Nn \l_chemmacros_nmr_delta_tl { \, #1 } ,
-    list       .bool_set:N    = \l_chemmacros_nmr_list_bool ,
+      \tl_set:Nn \l__chemmacros_nmr_delta_tl { \, #1 } ,
+    list       .bool_set:N    = \l__chemmacros_nmr_list_bool ,
     list       .default:n     = true ,
-    list-setup .tl_set:N      = \l_chemmacros_nmr_list_setup_tl ,
-    use-equal  .bool_set:N    = \l_chemmacros_nmr_use_equal_bool ,
+    list-setup .tl_set:N      = \l__chemmacros_nmr_list_setup_tl ,
+    use-equal  .bool_set:N    = \l__chemmacros_nmr_use_equal_bool ,
     use-equal  .default:n     = true
   }
 
-\prop_new:N \l_chemmacros_nmr_prop
+\prop_new:N \l__chemmacros_nmr_prop
 
 \NewDocumentCommand \DeclareChemNMR { mm }
   {
-    \prop_if_in:NnTF \l_chemmacros_nmr_prop { #1 }
+    \prop_if_in:NnTF \l__chemmacros_nmr_prop { #1 }
       { \chemmacros_msg:nnxx { chemmacros } { declare-nmr } { #1 } { } }
       {
-        \prop_put:Nnn \l_chemmacros_nmr_prop { #1 } { #2 }
+        \prop_put:Nnn \l__chemmacros_nmr_prop { #1 } { #2 }
         \NewDocumentCommand #1 { s }
           { \IfBooleanTF {##1} { \NMR*{#2} } { \NMR{#2} } }
       }
@@ -1985,9 +1985,9 @@
 
 \NewDocumentCommand \RenewChemNMR { mm }
   {
-    \prop_if_in:NnTF \l_chemmacros_nmr_prop { #1 }
+    \prop_if_in:NnTF \l__chemmacros_nmr_prop { #1 }
       {
-        \prop_put:Nnn \l_chemmacros_nmr_prop { #1 } { #2 }
+        \prop_put:Nnn \l__chemmacros_nmr_prop { #1 } { #2 }
         \NewDocumentCommand #1 { s }
           { \IfBooleanTF {##1} { \NMR*{#2} } { \NMR{#2} } }
       }
@@ -2000,34 +2000,34 @@
     % \NMR* same but without ": $\delta$" at end
     \NewDocumentCommand \NMR { s g d() o }
       {
-        \bool_if:NT \l_chemmacros_nmr_list_bool { \item \scan_stop: }
+        \bool_if:NT \l__chemmacros_nmr_list_bool { \item \scan_stop: }
         \group_begin:
           \chemmacros_leave_vmode:
-          \bool_set_false:N \l_chemmacros_nmr_frequency_bool
-          \bool_set_false:N \l_chemmacros_nmr_solvent_bool
+          \bool_set_false:N \l__chemmacros_nmr_frequency_bool
+          \bool_set_false:N \l__chemmacros_nmr_solvent_bool
           \IfNoValueF { #3 }
-            { \bool_set_true:N \l_chemmacros_nmr_frequency_bool }
+            { \bool_set_true:N \l__chemmacros_nmr_frequency_bool }
           \IfNoValueF { #4 }
-            { \bool_set_true:N \l_chemmacros_nmr_solvent_bool }
+            { \bool_set_true:N \l__chemmacros_nmr_solvent_bool }
           \bool_if:nT
             {
-              \l_chemmacros_nmr_frequency_bool
+              \l__chemmacros_nmr_frequency_bool
               ||
-              \l_chemmacros_nmr_solvent_bool
+              \l__chemmacros_nmr_solvent_bool
             }
-            { \bool_set_true:N \l_chemmacros_nmr_delimiters_bool }
+            { \bool_set_true:N \l__chemmacros_nmr_delimiters_bool }
           \bool_if:nT
             {
-              \l_chemmacros_nmr_frequency_bool
+              \l__chemmacros_nmr_frequency_bool
               &&
-              \l_chemmacros_nmr_solvent_bool
+              \l__chemmacros_nmr_solvent_bool
             }
-            { \bool_set_true:N \l_chemmacros_nmr_comma_bool }
+            { \bool_set_true:N \l__chemmacros_nmr_comma_bool }
           \IfNoValueTF { #2 }
             {
               \chemmacros_nmr_nucleus:w
-                \l_chemmacros_nmr_isotope_default_tl ,
-                \l_chemmacros_nmr_element_default_tl \q_stop
+                \l__chemmacros_nmr_isotope_default_tl ,
+                \l__chemmacros_nmr_element_default_tl \q_stop
             }
             { \chemmacros_nmr_nucleus:w #2 \q_stop }
           \mode_if_math:TF
@@ -2035,19 +2035,19 @@
               \text
                 {
                   \group_begin:
-                    \tl_use:N \l_chemmacros_nmr_format_tl
+                    \tl_use:N \l__chemmacros_nmr_format_tl
                     \chemmacros_nmr_base:VV
-                      \g_chemmacros_nmr_isotope_tl
-                      \g_chemmacros_nmr_element_tl
-                    \bool_if:NT \l_chemmacros_nmr_delimiters_bool
+                      \g__chemmacros_nmr_isotope_tl
+                      \g__chemmacros_nmr_element_tl
+                    \bool_if:NT \l__chemmacros_nmr_delimiters_bool
                       { ~ ( }
-                    \bool_if:NT \l_chemmacros_nmr_frequency_bool
+                    \bool_if:NT \l__chemmacros_nmr_frequency_bool
                       { \chemmacros_nmr_frequency:n { #3 } }
-                    \bool_if:NT \l_chemmacros_nmr_comma_bool
+                    \bool_if:NT \l__chemmacros_nmr_comma_bool
                       { , ~ }
-                    \bool_if:NT \l_chemmacros_nmr_solvent_bool
+                    \bool_if:NT \l__chemmacros_nmr_solvent_bool
                       { \chemmacros_atom:n { #4 } }
-                    \bool_if:NT \l_chemmacros_nmr_delimiters_bool
+                    \bool_if:NT \l__chemmacros_nmr_delimiters_bool
                       { ) }
                     \IfBooleanF { #1 } { : ~ }
                   \group_end:
@@ -2055,43 +2055,43 @@
               \IfBooleanF { #1 }
                 {
                   \delta
-                  \text { \l_chemmacros_nmr_delta_tl }
-                  \bool_if:NT \l_chemmacros_nmr_use_equal_bool { = }
+                  \text { \l__chemmacros_nmr_delta_tl }
+                  \bool_if:NT \l__chemmacros_nmr_use_equal_bool { = }
                 }
             }
             {
               \group_begin:
-                \tl_use:N \l_chemmacros_nmr_format_tl
+                \tl_use:N \l__chemmacros_nmr_format_tl
                 \chemmacros_nmr_base:VV
-                  \g_chemmacros_nmr_isotope_tl
-                  \g_chemmacros_nmr_element_tl
-                \bool_if:NT \l_chemmacros_nmr_delimiters_bool
+                  \g__chemmacros_nmr_isotope_tl
+                  \g__chemmacros_nmr_element_tl
+                \bool_if:NT \l__chemmacros_nmr_delimiters_bool
                   { ~ ( }
-                \bool_if:NT \l_chemmacros_nmr_frequency_bool
+                \bool_if:NT \l__chemmacros_nmr_frequency_bool
                   { \chemmacros_nmr_frequency:n { #3 } }
-                \bool_if:NT \l_chemmacros_nmr_comma_bool
+                \bool_if:NT \l__chemmacros_nmr_comma_bool
                   { , ~ }
-                \bool_if:NT \l_chemmacros_nmr_solvent_bool
+                \bool_if:NT \l__chemmacros_nmr_solvent_bool
                   {
-                    \bool_if:NTF \l_chemmacros_nmr_parse_bool
+                    \bool_if:NTF \l__chemmacros_nmr_parse_bool
                       {
-                        \bool_if:NTF \l_chemmacros_use_mhchem_bool
+                        \bool_if:NTF \l__chemmacros_use_mhchem_bool
                           { \ce { #4 } }
                           { \ch { #4 } }
                       }
                       { #4 }
                   }
-                \bool_if:NT \l_chemmacros_nmr_delimiters_bool
+                \bool_if:NT \l__chemmacros_nmr_delimiters_bool
                   { ) }
                 \IfBooleanF { #1 } { : }
               \group_end:
               \IfBooleanF { #1 }
                 {
                   \tl_use:N \c_space_tl $ \delta $
-                  \l_chemmacros_nmr_delta_tl
-                  \bool_if:NT \l_chemmacros_nmr_use_equal_bool { ~ = }
+                  \l__chemmacros_nmr_delta_tl
+                  \bool_if:NT \l__chemmacros_nmr_use_equal_bool { ~ = }
                 }
-              \bool_if:NF \l_chemmacros_nmr_comma_bool
+              \bool_if:NF \l__chemmacros_nmr_comma_bool
                 { \IfBooleanF { #1 } { \chemmacros_xspace: } }
             }
         \group_end:
@@ -2100,13 +2100,13 @@
 
 \NewDocumentCommand \chemmacros_data:w { smo }
   {
-    \bool_if:NT \l_chemmacros_nmr_list_bool { \item }
+    \bool_if:NT \l__chemmacros_nmr_list_bool { \item }
     {
-      \tl_use:N \l_chemmacros_nmr_format_tl #2
+      \tl_use:N \l__chemmacros_nmr_format_tl #2
       \IfNoValueF { #3 } { ~ ( #3 ) }
-      \IfBooleanT { #1 } { \bool_if:NT \l_chemmacros_nmr_use_equal_bool { : } }
+      \IfBooleanT { #1 } { \bool_if:NT \l__chemmacros_nmr_use_equal_bool { : } }
     }
-    \IfBooleanF { #1 } { \bool_if:NT \l_chemmacros_nmr_use_equal_bool { ~ = } }
+    \IfBooleanF { #1 } { \bool_if:NT \l__chemmacros_nmr_use_equal_bool { ~ = } }
   }
 
 \cs_new_protected_nopar:Npn \chemmacros_val:n #1
@@ -2122,17 +2122,17 @@
   {
     \group_begin:
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / nmr } { #1 } }
-    \bool_set_true:N \l_chemmacros_nmr_inner_bool
+    \bool_set_true:N \l__chemmacros_nmr_inner_bool
     \cs_set_eq:NN \# \chemmacros_nmr_number:n
     \cs_set_eq:NN \pos \chemmacros_nmr_position:n
     \cs_set_eq:NN \J \chemmacros_nmr_coupling:w
     \cs_set_eq:NN \data \chemmacros_data:w
     \cs_set_eq:NN \val \chemmacros_val:n
-    \bool_if:NT \l_chemmacros_nmr_list_bool
-      { \list {} { \l_chemmacros_nmr_list_setup_tl } }
+    \bool_if:NT \l__chemmacros_nmr_list_bool
+      { \list {} { \l__chemmacros_nmr_list_setup_tl } }
   }
   {
-    \bool_if:NT \l_chemmacros_nmr_list_bool
+    \bool_if:NT \l__chemmacros_nmr_list_bool
       { \endlist }
     \group_end:
     \chemmacros_ignore_spaces:
@@ -2141,33 +2141,33 @@
 \cs_new:Npn \chemmacros_nmr_number:n #1
   {
     #1 \,
-    \bool_if:NTF \l_chemmacros_bpchem_bool
-      { \g_chemmacros_nmr_element_tl }
-      { \chemmacros_atom:V \g_chemmacros_nmr_element_tl }
+    \bool_if:NTF \l__chemmacros_bpchem_bool
+      { \g__chemmacros_nmr_element_tl }
+      { \chemmacros_atom:V \g__chemmacros_nmr_element_tl }
   }
 
 \cs_new:Npn \chemmacros_nmr_position:n #1
   {
-    \bool_if:NTF \l_chemmacros_bpchem_bool
+    \bool_if:NTF \l__chemmacros_bpchem_bool
       {
-        \tl_use:N \g_chemmacros_nmr_element_tl
-        \bool_if:NTF \l_chemmacros_nmr_position_sub_bool
+        \tl_use:N \g__chemmacros_nmr_element_tl
+        \bool_if:NTF \l__chemmacros_nmr_position_sub_bool
           { $\sb{#1}$ }
           { - #1 }
       }
       {
-        \bool_if:NTF \l_chemmacros_nmr_position_sub_bool
+        \bool_if:NTF \l__chemmacros_nmr_position_sub_bool
           {
-            \chemmacros_chemformula:x { \g_chemmacros_nmr_element_tl _ #1 }
+            \chemmacros_chemformula:x { \g__chemmacros_nmr_element_tl _ #1 }
           }
-          { \chemmacros_atom:V \g_chemmacros_nmr_element_tl - #1 }
+          { \chemmacros_atom:V \g__chemmacros_nmr_element_tl - #1 }
       }
   }
 
 \cs_new:Npn \chemmacros_nmr_coupling:w
   {
-    \tl_clear:N \l_chemmacros_nmr_coupling_nuclei_tl
-    \tl_clear:N \l_chemmacros_nmr_coupling_bonds_tl
+    \tl_clear:N \l__chemmacros_nmr_coupling_nuclei_tl
+    \tl_clear:N \l__chemmacros_nmr_coupling_bonds_tl
     \peek_meaning:NTF (
       { \chemmacros_nmr_coupling_auxi:w }
       { \chemmacros_nmr_coupling_auxii:w }
@@ -2175,10 +2175,10 @@
 
 \cs_new:Npn \chemmacros_nmr_coupling_auxi:w (#1;#2)
   {
-    \tl_set:Nn \l_chemmacros_nmr_coupling_bonds_tl { #1 }
-    \tl_set:Nn \l_chemmacros_nmr_coupling_nuclei_tl { #2 }
-    \tl_put_right:Nn \l_chemmacros_nmr_coupling_nuclei_tl { ) }
-    \tl_put_left:Nn \l_chemmacros_nmr_coupling_nuclei_tl { ( }
+    \tl_set:Nn \l__chemmacros_nmr_coupling_bonds_tl { #1 }
+    \tl_set:Nn \l__chemmacros_nmr_coupling_nuclei_tl { #2 }
+    \tl_put_right:Nn \l__chemmacros_nmr_coupling_nuclei_tl { ) }
+    \tl_put_left:Nn \l__chemmacros_nmr_coupling_nuclei_tl { ( }
     \chemmacros_nmr_coupling_auxii:w
   }
 
@@ -2199,8 +2199,8 @@
           list-units=single
         }
       \(
-        ^{ \l_chemmacros_nmr_coupling_bonds_tl } J
-        \l_chemmacros_nmr_coupling_nuclei_tl = \SIlist{#2}{#1}
+        ^{ \l__chemmacros_nmr_coupling_bonds_tl } J
+        \l__chemmacros_nmr_coupling_nuclei_tl = \SIlist{#2}{#1}
       \)
     \group_end:
   }
@@ -2215,9 +2215,9 @@
           list-units=single
         }
       \(
-         ^{ \l_chemmacros_nmr_coupling_bonds_tl } J
-         \l_chemmacros_nmr_coupling_nuclei_tl
-         = \exp_args:Nno \SIlist { #1 } { \l_chemmacros_nmr_coupling_unit_tl }
+         ^{ \l__chemmacros_nmr_coupling_bonds_tl } J
+         \l__chemmacros_nmr_coupling_nuclei_tl
+         = \exp_args:Nno \SIlist { #1 } { \l__chemmacros_nmr_coupling_unit_tl }
       \)
     \group_end:
   }
@@ -2228,35 +2228,35 @@
   { \settowidth { #1 } { #2 } }
 \cs_generate_variant:Nn \dim_to_width:nn { Nn }
 
-\bool_new:N \l_chemmacros_mhname_width_bool
-\bool_set_false:N \l_chemmacros_mhname_width_bool
-\dim_new:N \l_chemmacros_mhname_width_dim
+\bool_new:N \l__chemmacros_mhname_width_bool
+\bool_set_false:N \l__chemmacros_mhname_width_bool
+\dim_new:N \l__chemmacros_mhname_width_dim
 
-\tl_new:N \l_chemmacros_mhname_align_tl
-\tl_set:Nn \l_chemmacros_mhname_align_tl { \centering }
+\tl_new:N \l__chemmacros_mhname_align_tl
+\tl_set:Nn \l__chemmacros_mhname_align_tl { \centering }
 
-\tl_new:N \l_chemmacros_mhname_format_tl
-\tl_new:N \l_chemmacros_mhname_fontsize_tl
-\tl_set:Nn \l_chemmacros_mhname_fontsize_tl { \tiny }
+\tl_new:N \l__chemmacros_mhname_format_tl
+\tl_new:N \l__chemmacros_mhname_fontsize_tl
+\tl_set:Nn \l__chemmacros_mhname_fontsize_tl { \tiny }
 
 \keys_define:nn { chemmacros / mhName }
   {
-    align     .tl_set:N  = \l_chemmacros_mhname_align_tl ,
-    format  .tl_set:N  = \l_chemmacros_mhname_format_tl ,
-    fontsize  .tl_set:N  = \l_chemmacros_mhname_fontsize_tl ,
+    align     .tl_set:N  = \l__chemmacros_mhname_align_tl ,
+    format  .tl_set:N  = \l__chemmacros_mhname_format_tl ,
+    fontsize  .tl_set:N  = \l__chemmacros_mhname_fontsize_tl ,
     width     .code:n    =
       {
         \tl_if_eq:nnTF { #1 } { auto }
-          { \bool_set_false:N \l_chemmacros_mhname_width_bool }
+          { \bool_set_false:N \l__chemmacros_mhname_width_bool }
           {
-            \bool_set_true:N \l_chemmacros_mhname_width_bool
-            \dim_set:Nn \l_chemmacros_mhname_width_dim { #1 }
+            \bool_set_true:N \l__chemmacros_mhname_width_bool
+            \dim_set:Nn \l__chemmacros_mhname_width_dim { #1 }
           }
       }
   }
 
 % \mhName[<keyval>]{<chemformula>}{<text>}
-\bool_if:nF { \l_chemmacros_version_one_bool || \l_chemmacros_use_mhchem_bool }
+\bool_if:nF { \l__chemmacros_version_one_bool || \l__chemmacros_use_mhchem_bool }
   {
     \NewDocumentCommand \mhName { o m m }
       {
@@ -2266,14 +2266,14 @@
             {
               \underset
                 {
-                  \bool_if:NF \l_chemmacros_mhname_width_bool
-                    { \dim_to_width:Nn \l_chemmacros_mhname_width_dim { #2 } }
+                  \bool_if:NF \l__chemmacros_mhname_width_bool
+                    { \dim_to_width:Nn \l__chemmacros_mhname_width_dim { #2 } }
                   \parbox
-                    { \dim_use:N \l_chemmacros_mhname_width_dim }
+                    { \dim_use:N \l__chemmacros_mhname_width_dim }
                     {
-                      \tl_use:N \l_chemmacros_mhname_align_tl
-                      \tl_use:N \l_chemmacros_mhname_format_tl
-                      \tl_use:N \l_chemmacros_mhname_fontsize_tl
+                      \tl_use:N \l__chemmacros_mhname_align_tl
+                      \tl_use:N \l__chemmacros_mhname_format_tl
+                      \tl_use:N \l__chemmacros_mhname_fontsize_tl
                       #3
                     }
                 }
@@ -2285,57 +2285,57 @@
 
 % --------------------------------------------------------------------------- %
 % - phases
-\bool_new:N \l_chemmacros_phases_sub_bool
-\dim_new:N \l_chemmacros_phases_space_dim
-\dim_set:Nn \l_chemmacros_phases_space_dim { .1333 em }
+\bool_new:N \l__chemmacros_phases_sub_bool
+\dim_new:N \l__chemmacros_phases_space_dim
+\dim_set:Nn \l__chemmacros_phases_space_dim { .1333 em }
 
 \keys_define:nn { chemmacros / phases }
   {
     pos        .choice: ,
-    pos / sub  .code:n    = \bool_set_true:N \l_chemmacros_phases_sub_bool ,
-    pos / side .code:n    = \bool_set_false:N \l_chemmacros_phases_sub_bool ,
-    space      .dim_set:N = \l_chemmacros_phases_space_dim
+    pos / sub  .code:n    = \bool_set_true:N \l__chemmacros_phases_sub_bool ,
+    pos / side .code:n    = \bool_set_false:N \l__chemmacros_phases_sub_bool ,
+    space      .dim_set:N = \l__chemmacros_phases_space_dim
   }
 
-\prop_new:N \l_chemmacros_phases_prop
-\prop_new:N \l_chemmacros_phases_german_prop
+\prop_new:N \l__chemmacros_phases_prop
+\prop_new:N \l__chemmacros_phases_german_prop
 
 \NewDocumentCommand \DeclareChemPhase { mom }
   {
-    \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
-    \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl }
+    \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
+    \tl_set:Nf \l__chemmacros_tmpa_tl { \tl_tail:V \l__chemmacros_tmpa_tl }
     \cs_if_free:NTF #1
       { \cs_new_nopar:Npn #1 {} }
       { \chemmacros_msg:nnxx { chemmacros } { declare-phase } { #1 } {} }
     \IfNoValueTF { #2 }
-      { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #3 } }
-      { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #2 } }
-    \prop_put:Non \l_chemmacros_phases_prop { \l_chemmacros_tmpa_tl } { #3 }
+      { \prop_put:Non \l__chemmacros_phases_german_prop { \l__chemmacros_tmpa_tl } { #3 } }
+      { \prop_put:Non \l__chemmacros_phases_german_prop { \l__chemmacros_tmpa_tl } { #2 } }
+    \prop_put:Non \l__chemmacros_phases_prop { \l__chemmacros_tmpa_tl } { #3 }
     \chemmacros_make_phases:
   }
 
 \NewDocumentCommand \RenewChemPhase { mom }
   {
-    \tl_set_rescan:Nnn \l_chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
-    \tl_set:Nf \l_chemmacros_tmpa_tl { \tl_tail:V \l_chemmacros_tmpa_tl }
+    \tl_set_rescan:Nnn \l__chemmacros_tmpa_tl { \char_set_catcode_letter:N \\ } { #1 }
+    \tl_set:Nf \l__chemmacros_tmpa_tl { \tl_tail:V \l__chemmacros_tmpa_tl }
     \cs_if_free:NT #1
       { \chemmacros_msg:nnxx { chemmacros } { renew-phase } { #1 } {} }
     \IfNoValueTF { #2 }
-      { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #3 } }
-      { \prop_put:Non \l_chemmacros_phases_german_prop { \l_chemmacros_tmpa_tl } { #2 } }
-    \prop_put:Non \l_chemmacros_phases_prop { \l_chemmacros_tmpa_tl } { #3 }
+      { \prop_put:Non \l__chemmacros_phases_german_prop { \l__chemmacros_tmpa_tl } { #3 } }
+      { \prop_put:Non \l__chemmacros_phases_german_prop { \l__chemmacros_tmpa_tl } { #2 } }
+    \prop_put:Non \l__chemmacros_phases_prop { \l__chemmacros_tmpa_tl } { #3 }
     \chemmacros_make_phases:
   }
 
 \cs_new_nopar:Npn \chemmacros_make_phases:
   {
-    \bool_if:NTF \l_chemmacros_german_bool
+    \bool_if:NTF \l__chemmacros_german_bool
       {
-        \prop_map_function:NN \l_chemmacros_phases_german_prop
+        \prop_map_function:NN \l__chemmacros_phases_german_prop
           \chemmacros_define_phases:nn
       }
       {
-        \prop_map_function:NN \l_chemmacros_phases_prop
+        \prop_map_function:NN \l__chemmacros_phases_prop
           \chemmacros_define_phases:nn
       }
   }
@@ -2344,16 +2344,16 @@
   {
     \cs_set_nopar:cpn { #1 }
       {
-        \bool_if:NTF \l_chemmacros_phases_sub_bool
+        \bool_if:NTF \l__chemmacros_phases_sub_bool
           {
-            \bool_if:NTF \l_chemformula_inside_ch_bool
+            \bool_if:NTF \l__chemformula_inside_ch_bool
               { \chemformula_subscript:n { ( #2 ) } }
               { \ensuremath { \c_math_subscript_token { \text { (#2) } } } }
           }
           {
             \ensuremath
               {
-                \skip_horizontal:N \l_chemmacros_phases_space_dim
+                \skip_horizontal:N \l__chemmacros_phases_space_dim
                 \text { (#2) }
               }
           }
@@ -2367,18 +2367,18 @@
 
 \NewDocumentCommand \phase { m }
   {
-    \bool_if:NTF \l_chemmacros_phases_sub_bool
+    \bool_if:NTF \l__chemmacros_phases_sub_bool
       { \ensuremath { \c_math_subscript_token { \text { (#1) } } } }
       {
         \ensuremath
           {
-            \skip_horizontal:N \l_chemmacros_phases_space_dim
+            \skip_horizontal:N \l__chemmacros_phases_space_dim
             \text { (#1) }
           }
       }
   }
 
-\bool_if:NT \l_chemmacros_version_one_bool
+\bool_if:NT \l__chemmacros_version_one_bool
   {
     \cs_new_eq:NN \solid \sld
     \cs_new_eq:NN \liquid \lqd
@@ -2402,45 +2402,45 @@
               {
                 \addcontentsline { lor } { reaction }
                   {
-                    \l_chemmacros_reaction_lorname_tl #3 #2 ##1 #4
-                    \tl_use:N \g_chemmacros_reaction_description_tl
+                    \l__chemmacros_reaction_lorname_tl #3 #2 ##1 #4
+                    \tl_use:N \g__chemmacros_reaction_description_tl
                   }
-                \tl_gclear:N \g_chemmacros_reaction_description_tl
+                \tl_gclear:N \g__chemmacros_reaction_description_tl
               }
           }
       }
   }
 
-\tl_new:N \g_chemmacros_reaction_description_tl
+\tl_new:N \g__chemmacros_reaction_description_tl
 \NewDocumentCommand \AddRxnDesc { m }
   {
     \tl_if_blank:nF { #1 }
-      { \tl_gset:Nn \g_chemmacros_reaction_description_tl { : ~ #1 } }
+      { \tl_gset:Nn \g__chemmacros_reaction_description_tl { : ~ #1 } }
   }
 
 % define \listofreactions
-\tl_new:N \l_chemmacros_reaction_lorname_tl
-\tl_set:Nn \l_chemmacros_reaction_lorname_tl { Reaction ~ }
+\tl_new:N \l__chemmacros_reaction_lorname_tl
+\tl_set:Nn \l__chemmacros_reaction_lorname_tl { Reaction ~ }
 \tl_new:N \reactionlistname
 \tl_set:Nn \reactionlistname { List~of~reactions }
 
 % language settings
 \AtBeginDocument
   {
-    \bool_if:NT \l_chemmacros_german_bool
+    \bool_if:NT \l__chemmacros_german_bool
       {
         \tl_set:Nn \reactionlistname { Reaktionsverzeichnis }
-        \tl_set:Nn \l_chemmacros_reaction_lorname_tl { Reaktion ~ }
+        \tl_set:Nn \l__chemmacros_reaction_lorname_tl { Reaktion ~ }
       }
-    \bool_if:NT \l_chemmacros_italian_bool
+    \bool_if:NT \l__chemmacros_italian_bool
       {
         \tl_set:Nn \reactionlistname { Elenco ~ delle ~ reazioni }
-        \tl_set:Nn \l_chemmacros_reaction_lorname_tl { Reazione ~ }
+        \tl_set:Nn \l__chemmacros_reaction_lorname_tl { Reazione ~ }
       }
-    \bool_if:NT \l_chemmacros_french_bool
+    \bool_if:NT \l__chemmacros_french_bool
       {
         \tl_set:Nn \reactionlistname { Table ~ des ~ r\'eactions }
-        \tl_set:Nn \l_chemmacros_reaction_lorname_tl { R\'eaction ~ }
+        \tl_set:Nn \l__chemmacros_reaction_lorname_tl { R\'eaction ~ }
       }
   }
 
@@ -2451,7 +2451,7 @@
   { \@dottedtocline { 1 } { 1.5em } { 2.3em } { #1 } { #2 } }
 
 % create tagform
-\bool_if:NTF \l_chemmacros_version_one_bool
+\bool_if:NTF \l__chemmacros_version_one_bool
   { \newtagform { CMreaction } { \{ } { \} } }
   { \newtagform { reaction } { \{ } { \} } }
 \newcounter { chemmacros_save_reaction }
@@ -2461,17 +2461,17 @@
 \cs_new_nopar:Npn \chemmacros_begin_reaction:
   {
     % create individual names for `hyperref':
-    \bool_if:NT \l_chemmacros_hyperref_bool
+    \bool_if:NT \l__chemmacros_hyperref_bool
       {
         \cs_set_nopar:Npn \theHequation
           { R . \theHsection . \arabic { reaction } }
       }
     % enable labelformat `reaction':
-    \bool_if:NT \l_chemmacros_varioref_bool
+    \bool_if:NT \l__chemmacros_varioref_bool
       { \cs_set_eq:NN \p@equation \p@reaction }
     \setcounter { chemmacros_save_reaction } { \value { equation } }
     \setcounter { equation } { \value { reaction } }
-    \bool_if:NTF \l_chemmacros_version_one_bool
+    \bool_if:NTF \l__chemmacros_version_one_bool
       { \usetagform { CMreaction } }
       { \usetagform { reaction } }
   }
@@ -2484,22 +2484,22 @@
   }
 
 % --------------------------------------------------------------------------- %
-\bool_new:N \l_chemmacros_reactions_star_bool
-\bool_new:N \l_chemmacros_reactions_args_bool
+\bool_new:N \l__chemmacros_reactions_star_bool
+\bool_new:N \l__chemmacros_reactions_args_bool
 
 \keys_define:nn { chemmacros / reaction }
   {
-    star       .bool_set:N = \l_chemmacros_reactions_star_bool ,
+    star       .bool_set:N = \l__chemmacros_reactions_star_bool ,
     star       .default:n  = true ,
-    arg        .bool_set:N = \l_chemmacros_reactions_args_bool ,
+    arg        .bool_set:N = \l__chemmacros_reactions_args_bool ,
     arg        .default:n  = true ,
     list-name  .tl_set:N   = \reactionlistname ,
     list-entry .code:n     =
-      \tl_set:Nn \l_chemmacros_reaction_lorname_tl { #1 ~ }
+      \tl_set:Nn \l__chemmacros_reaction_lorname_tl { #1 ~ }
   }
 
 % \DeclareChemReaction[<keyval>]{<name>}{<type>}
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
   \NewDocumentCommand \DeclareChemReaction { o m m }
     {
@@ -2508,11 +2508,11 @@
         {
           \IfNoValueTF { #1 }
             {
-              \bool_set_false:N \l_chemmacros_reactions_star_bool
-              \bool_set_false:N \l_chemmacros_reactions_args_bool
+              \bool_set_false:N \l__chemmacros_reactions_star_bool
+              \bool_set_false:N \l__chemmacros_reactions_args_bool
             }
             { \keys_set:nn { chemmacros / reaction } { #1 } }
-          \bool_if:NTF \l_chemmacros_reactions_args_bool
+          \bool_if:NTF \l__chemmacros_reactions_args_bool
             {
               \NewEnviron { #2 } [ 2 ] []
                 {
@@ -2523,7 +2523,7 @@
                   \end{ #3 }
                   \chemmacros_end_reaction:
                 }
-              \bool_if:NT \l_chemmacros_reactions_star_bool
+              \bool_if:NT \l__chemmacros_reactions_star_bool
                 {
                   \NewEnviron { #2* } [ 1 ]
                     {
@@ -2543,7 +2543,7 @@
                   \end { #3 }
                   \chemmacros_end_reaction:
                 }
-              \bool_if:NT \l_chemmacros_reactions_star_bool
+              \bool_if:NT \l__chemmacros_reactions_star_bool
                 {
                   \NewEnviron { #2* }
                     {
@@ -2566,14 +2566,14 @@
 
 \cs_new:Npn \chemmacros_equation_chemformula:n #1
   {
-    \bool_if:NTF \l_chemmacros_use_mhchem_bool
+    \bool_if:NTF \l__chemmacros_use_mhchem_bool
       { \cee { #1 } }
       { \ch { #1 } }
   }
 \cs_generate_variant:Nn \chemmacros_equation_chemformula:n { o }
 
 % predefined:
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
     \DeclareChemReaction [ star ] { reaction }  { equation }
     \DeclareChemReaction [ star ] { reactions } { align }
@@ -2606,37 +2606,37 @@
 
 % --------------------------------------------------------------------------- %
 % \State
-\tl_new:N \l_chemmacros_State_delta_tl
-\tl_set:Nn \l_chemmacros_State_delta_tl { \Delta }
-\bool_new:N \l_chemmacros_State_delta_bool
-\bool_set_true:N \l_chemmacros_State_delta_bool
-\bool_new:N \l_chemmacros_State_subscript_left_bool
-\bool_set_true:N \l_chemmacros_State_subscript_left_bool
-\bool_new:N \l_chemmacros_State_exponent_bool
-\bool_set_true:N \l_chemmacros_State_exponent_bool
-\tl_new:N \l_chemmacros_State_exponent_tl
-\tl_set:Nn \l_chemmacros_State_exponent_tl { \standardstate }
+\tl_new:N \l__chemmacros_State_delta_tl
+\tl_set:Nn \l__chemmacros_State_delta_tl { \Delta }
+\bool_new:N \l__chemmacros_State_delta_bool
+\bool_set_true:N \l__chemmacros_State_delta_bool
+\bool_new:N \l__chemmacros_State_subscript_left_bool
+\bool_set_true:N \l__chemmacros_State_subscript_left_bool
+\bool_new:N \l__chemmacros_State_exponent_bool
+\bool_set_true:N \l__chemmacros_State_exponent_bool
+\tl_new:N \l__chemmacros_State_exponent_tl
+\tl_set:Nn \l__chemmacros_State_exponent_tl { \standardstate }
 
 \keys_define:nn { chemmacros / state }
   {
     delta     .code:n     =
       {
         \exp_args:Nf \tl_if_eq:nnTF { #1 } { false }
-          { \bool_set_false:N \l_chemmacros_State_delta_bool }
+          { \bool_set_false:N \l__chemmacros_State_delta_bool }
           {
-            \bool_set_true:N \l_chemmacros_State_delta_bool
-            \tl_set:Nn \l_chemmacros_State_delta_tl { #1 }
+            \bool_set_true:N \l__chemmacros_State_delta_bool
+            \tl_set:Nn \l__chemmacros_State_delta_tl { #1 }
           }
       } ,
-    subscript-left .bool_set:N = \l_chemmacros_State_subscript_left_bool ,
+    subscript-left .bool_set:N = \l__chemmacros_State_subscript_left_bool ,
     subscript-left .default:n  = true ,
     exponent  .code:n     =
       {
         \exp_args:Nf \tl_if_eq:nnTF { #1 } { false }
-          { \bool_set_false:N \l_chemmacros_State_exponent_bool }
+          { \bool_set_false:N \l__chemmacros_State_exponent_bool }
           {
-            \bool_set_true:N \l_chemmacros_State_exponent_bool
-            \tl_set:Nn \l_chemmacros_State_exponent_tl { #1 }
+            \bool_set_true:N \l__chemmacros_State_exponent_bool
+            \tl_set:Nn \l__chemmacros_State_exponent_tl { #1 }
           }
       } ,
     exponent  .default:n  = \standardstate
@@ -2654,21 +2654,21 @@
         { \keys_set:nn { chemmacros / state } { #1 } }
       \ensuremath
        {
-          \bool_if:NT \l_chemmacros_State_delta_bool
-            { \tl_use:N \l_chemmacros_State_delta_tl }
-          \bool_if:NT \l_chemmacros_State_subscript_left_bool
+          \bool_if:NT \l__chemmacros_State_delta_bool
+            { \tl_use:N \l__chemmacros_State_delta_tl }
+          \bool_if:NT \l__chemmacros_State_subscript_left_bool
             { \c_math_subscript_token { \text { #3 } } }
           #2
-          \bool_if:NF \l_chemmacros_State_subscript_left_bool
+          \bool_if:NF \l__chemmacros_State_subscript_left_bool
             { \c_math_subscript_token { \text { #3 } } }
-          \bool_if:NT \l_chemmacros_State_exponent_bool
-            { ^ { \tl_use:N \l_chemmacros_State_exponent_tl } }
+          \bool_if:NT \l__chemmacros_State_exponent_bool
+            { ^ { \tl_use:N \l__chemmacros_State_exponent_tl } }
         }
     \group_end:
   }
 \cs_generate_variant:Nn \chemmacros_state:nnn { fnn,xnn }
 
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
     \NewDocumentCommand \State { s o m G{} }
       {
@@ -2684,52 +2684,52 @@
   }
 
 % --------------------------------------------------------------------------- %
-\tl_new:N \l_chemmacros_thermod_subscript_left_tl
-\tl_new:N \l_chemmacros_thermod_subscript_left_default_tl
-\tl_new:N \l_chemmacros_thermod_subscript_tl
-\tl_new:N \l_chemmacros_thermod_subscript_default_tl
+\tl_new:N \l__chemmacros_thermod_subscript_left_tl
+\tl_new:N \l__chemmacros_thermod_subscript_left_default_tl
+\tl_new:N \l__chemmacros_thermod_subscript_tl
+\tl_new:N \l__chemmacros_thermod_subscript_default_tl
 
-\tl_new:N \l_chemmacros_thermod_unit_tl
+\tl_new:N \l__chemmacros_thermod_unit_tl
 
-\tl_new:N \l_chemmacros_thermod_exponent_tl
-\tl_new:N \l_chemmacros_thermod_exponent_default_tl
-\tl_set:Nn \l_chemmacros_thermod_exponent_default_tl { \standardstate }
+\tl_new:N \l__chemmacros_thermod_exponent_tl
+\tl_new:N \l__chemmacros_thermod_exponent_default_tl
+\tl_set:Nn \l__chemmacros_thermod_exponent_default_tl { \standardstate }
 
-\tl_new:N \l_chemmacros_thermod_delta_tl
-\tl_new:N \l_chemmacros_thermod_delta_default_tl
-\tl_set:Nn \l_chemmacros_thermod_delta_default_tl { \Delta }
+\tl_new:N \l__chemmacros_thermod_delta_tl
+\tl_new:N \l__chemmacros_thermod_delta_default_tl
+\tl_set:Nn \l__chemmacros_thermod_delta_default_tl { \Delta }
 
-\bool_new:N \l_chemmacros_renewstate_bool
+\bool_new:N \l__chemmacros_renewstate_bool
 
 \keys_define:nn { chemmacros }
   {
     State / subscript         .choice: ,
     State / subscript / left  .code:n   =
-      { \tl_set:Nn \l_chemmacros_thermod_subscript_left_tl { true } } ,
+      { \tl_set:Nn \l__chemmacros_thermod_subscript_left_tl { true } } ,
     State / subscript / right .code:n   =
-      { \tl_set:Nn \l_chemmacros_thermod_subscript_left_tl { false } } ,
+      { \tl_set:Nn \l__chemmacros_thermod_subscript_left_tl { false } } ,
     State / exponent          .tl_set:N =
-      \l_chemmacros_thermod_exponent_tl ,
+      \l__chemmacros_thermod_exponent_tl ,
     State / delta             .tl_set:N =
-      \l_chemmacros_thermod_delta_tl ,
+      \l__chemmacros_thermod_delta_tl ,
     State / unit              .tl_set:N =
-      \l_chemmacros_thermod_unit_tl ,
+      \l__chemmacros_thermod_unit_tl ,
     setnewstate / subscript-left .tl_set:N =
-      \l_chemmacros_thermod_subscript_left_default_tl ,
+      \l__chemmacros_thermod_subscript_left_default_tl ,
     setnewstate / subscript   .tl_set:N =
-      \l_chemmacros_thermod_subscript_default_tl ,
+      \l__chemmacros_thermod_subscript_default_tl ,
     setnewstate / exponent    .tl_set:N =
-      \l_chemmacros_thermod_exponent_default_tl ,
+      \l__chemmacros_thermod_exponent_default_tl ,
     setnewstate / delta       .tl_set:N =
-      \l_chemmacros_thermod_delta_default_tl
+      \l__chemmacros_thermod_delta_default_tl
   }
 
 % \DeclareChemState[<keyval>]{<name>}{<symbol>}{<unit>}
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
     \cs_new:Npn \DeclareChemState
       {
-        \bool_set_false:N \l_chemmacros_renewstate_bool
+        \bool_set_false:N \l__chemmacros_renewstate_bool
         \chemmacros_setnewstate_reset:
         \peek_meaning:NTF [
           { \setnewstate_aux_i:n }
@@ -2738,7 +2738,7 @@
 % \RenewChemState[<keyval>]{<name>}{<symbol>}{<unit>}
     \cs_new:Npn \RenewChemState
       {
-        \bool_set_true:N \l_chemmacros_renewstate_bool
+        \bool_set_true:N \l__chemmacros_renewstate_bool
         \chemmacros_setnewstate_reset:
         \peek_meaning:NTF [
           { \setnewstate_aux_i:n }
@@ -2760,10 +2760,10 @@
 
 \cs_new_nopar:Npn \chemmacros_setnewstate_reset:
   {
-    \tl_set:Nn \l_chemmacros_thermod_subscript_left_default_tl { true }
-    \tl_clear:N \l_chemmacros_thermod_subscript_default_tl
-    \tl_set:Nn \l_chemmacros_thermod_exponent_default_tl { \standardstate }
-    \tl_set:Nn \l_chemmacros_thermod_delta_default_tl { \Delta }
+    \tl_set:Nn \l__chemmacros_thermod_subscript_left_default_tl { true }
+    \tl_clear:N \l__chemmacros_thermod_subscript_default_tl
+    \tl_set:Nn \l__chemmacros_thermod_exponent_default_tl { \standardstate }
+    \tl_set:Nn \l__chemmacros_thermod_delta_default_tl { \Delta }
   }
 
 \cs_new:Npn \setnewstate_aux_i:n [#1]
@@ -2774,16 +2774,16 @@
 
 \cs_new:Npn \setnewstate_aux_ii:nnn #1#2#3
   {
-    \bool_if:NTF \l_chemmacros_renewstate_bool
+    \bool_if:NTF \l__chemmacros_renewstate_bool
       {
         \cs_if_exist:cF { #1 }
           { \msg_error:nnx { chemmacros } { renewstate } { #1 } }
         \cs_undefine:c {chemmacros_ #1 _reset: }
-        \cs_undefine:c { l_chemmacros_ #1 _subscript_tl }
-        \cs_undefine:c { l_chemmacros_ #1 _exponent_tl }
-        \cs_undefine:c { l_chemmacros_ #1 _delta_tl }
-        \cs_undefine:c { l_chemmacros_ #1 _left_tl }
-        \cs_undefine:c { l_chemmacros_ #1 _unit_tl }
+        \cs_undefine:c { l__chemmacros_ #1 _subscript_tl }
+        \cs_undefine:c { l__chemmacros_ #1 _exponent_tl }
+        \cs_undefine:c { l__chemmacros_ #1 _delta_tl }
+        \cs_undefine:c { l__chemmacros_ #1 _left_tl }
+        \cs_undefine:c { l__chemmacros_ #1 _unit_tl }
         \cs_undefine:c { #1 }
         \cs_undefine:c { #1 _aux_i:n }
         \cs_undefine:c { #1 _aux_ii:n }
@@ -2795,37 +2795,37 @@
       }
     \group_begin:
       \exp_args:Nnf \tl_const:cn
-        { l_chemmacros_ #1 _subscript_tl }
-        { \tl_use:N \l_chemmacros_thermod_subscript_default_tl }
+        { l__chemmacros_ #1 _subscript_tl }
+        { \tl_use:N \l__chemmacros_thermod_subscript_default_tl }
       \exp_args:Nnf \tl_const:cn
-        { l_chemmacros_ #1 _exponent_tl }
-        { \tl_use:N \l_chemmacros_thermod_exponent_default_tl }
+        { l__chemmacros_ #1 _exponent_tl }
+        { \tl_use:N \l__chemmacros_thermod_exponent_default_tl }
       \exp_args:Nnf \tl_const:cn
-        { l_chemmacros_ #1 _delta_tl }
-        { \tl_use:N \l_chemmacros_thermod_delta_default_tl }
+        { l__chemmacros_ #1 _delta_tl }
+        { \tl_use:N \l__chemmacros_thermod_delta_default_tl }
       \exp_args:Nnf \tl_const:cn
-        { l_chemmacros_ #1 _left_tl }
-        { \tl_use:N \l_chemmacros_thermod_subscript_left_default_tl }
+        { l__chemmacros_ #1 _left_tl }
+        { \tl_use:N \l__chemmacros_thermod_subscript_left_default_tl }
       \tl_const:cn
-        { l_chemmacros_ #1 _unit_tl }
+        { l__chemmacros_ #1 _unit_tl }
         { #3 }
       \cs_new_nopar:cpn {chemmacros_ #1 _reset: }
         {
           \tl_set_eq:Nc
-            \l_chemmacros_thermod_subscript_tl
-            { l_chemmacros_ #1 _subscript_tl }
+            \l__chemmacros_thermod_subscript_tl
+            { l__chemmacros_ #1 _subscript_tl }
           \tl_set_eq:Nc
-            \l_chemmacros_thermod_exponent_tl
-            { l_chemmacros_ #1 _exponent_tl }
+            \l__chemmacros_thermod_exponent_tl
+            { l__chemmacros_ #1 _exponent_tl }
           \tl_set_eq:Nc
-            \l_chemmacros_thermod_delta_tl
-            { l_chemmacros_ #1 _delta_tl }
+            \l__chemmacros_thermod_delta_tl
+            { l__chemmacros_ #1 _delta_tl }
           \tl_set_eq:Nc
-            \l_chemmacros_thermod_subscript_left_tl
-            { l_chemmacros_ #1 _left_tl }
+            \l__chemmacros_thermod_subscript_left_tl
+            { l__chemmacros_ #1 _left_tl }
           \tl_set_eq:Nc
-            \l_chemmacros_thermod_unit_tl
-            { l_chemmacros_ #1 _unit_tl }
+            \l__chemmacros_thermod_unit_tl
+            { l__chemmacros_ #1 _unit_tl }
         }
       \cs_new_nopar:cpn { #1 }
         {
@@ -2847,7 +2847,7 @@
         }
       \cs_new_nopar:cpn { #1 _aux_ii:n } (##1)
         {
-          \tl_set:Nn \l_chemmacros_thermod_subscript_tl { ##1 }
+          \tl_set:Nn \l__chemmacros_thermod_subscript_tl { ##1 }
           \tl_use:c { #1 _aux_iii:n }
         }
       \cs_new_nopar:cpn { #1 _aux_iii:n } ##1
@@ -2855,15 +2855,15 @@
           \ensuremath
             {
               \exp_args:Nf \tl_if_eq:nnTF
-                { \tl_use:N \l_chemmacros_thermod_subscript_left_tl } { true }
+                { \tl_use:N \l__chemmacros_thermod_subscript_left_tl } { true }
                 {
                   \chemmacros_state:fnn
                   {
                     subscript-left = true ,
                     exponent       =
-                      { \tl_use:N \l_chemmacros_thermod_exponent_tl } ,
+                      { \tl_use:N \l__chemmacros_thermod_exponent_tl } ,
                     delta          =
-                      { \tl_use:N \l_chemmacros_thermod_delta_tl }
+                      { \tl_use:N \l__chemmacros_thermod_delta_tl }
                   }
                   { #2 }
                 }
@@ -2872,15 +2872,15 @@
                   {
                     subscript-left = false ,
                     exponent       =
-                      { \tl_use:N \l_chemmacros_thermod_exponent_tl } ,
+                      { \tl_use:N \l__chemmacros_thermod_exponent_tl } ,
                     delta          =
-                      { \tl_use:N \l_chemmacros_thermod_delta_tl }
+                      { \tl_use:N \l__chemmacros_thermod_delta_tl }
                   }
                   { #2 }
                 }
-                { \tl_use:N \l_chemmacros_thermod_subscript_tl }
+                { \tl_use:N \l__chemmacros_thermod_subscript_tl }
                 =
-                \exp_args:Nno \SI { ##1 } { \l_chemmacros_thermod_unit_tl }
+                \exp_args:Nno \SI { ##1 } { \l__chemmacros_thermod_unit_tl }
             }
         }
     \group_end:
@@ -2888,7 +2888,7 @@
   }
 
 % predefined:
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
     \DeclareChemState {Enthalpy} {H} {\kilo\joule\per\mole}
     \DeclareChemState [ delta=false, subscript-left=false ] {Entropy}
@@ -2898,46 +2898,46 @@
 
 % --------------------------------------------------------------------------- %
 % Newman projections
-\fp_new:N \l_chemmacros_newman_rel_angle_fp
-\fp_zero:N \l_chemmacros_newman_rel_angle_fp
-\fp_new:N \l_chemmacros_newman_tmp_angle_fp
-\fp_new:N \l_chemmacros_newman_abs_angle_fp
-\fp_zero:N \l_chemmacros_newman_abs_angle_fp
+\fp_new:N \l__chemmacros_newman_rel_angle_fp
+\fp_zero:N \l__chemmacros_newman_rel_angle_fp
+\fp_new:N \l__chemmacros_newman_tmp_angle_fp
+\fp_new:N \l__chemmacros_newman_abs_angle_fp
+\fp_zero:N \l__chemmacros_newman_abs_angle_fp
 
-\fp_new:N \l_chemmacros_newman_scale_fp
-\fp_set:Nn \l_chemmacros_newman_scale_fp { 1 }
+\fp_new:N \l__chemmacros_newman_scale_fp
+\fp_set:Nn \l__chemmacros_newman_scale_fp { 1 }
 
-\tl_new:N \l_chemmacros_newman_tikz_ring_tl
-\tl_clear:N \l_chemmacros_newman_tikz_ring_tl
+\tl_new:N \l__chemmacros_newman_tikz_ring_tl
+\tl_clear:N \l__chemmacros_newman_tikz_ring_tl
 
-\tl_new:N \l_chemmacros_newman_tikz_front_tl
-\tl_clear:N \l_chemmacros_newman_tikz_front_tl
+\tl_new:N \l__chemmacros_newman_tikz_front_tl
+\tl_clear:N \l__chemmacros_newman_tikz_front_tl
 
-\tl_new:N \l_chemmacros_newman_tikz_back_tl
-\tl_clear:N \l_chemmacros_newman_tikz_back_tl
+\tl_new:N \l__chemmacros_newman_tikz_back_tl
+\tl_clear:N \l__chemmacros_newman_tikz_back_tl
 
-\bool_new:N \l_chemmacros_newman_tikz_back_bool
+\bool_new:N \l__chemmacros_newman_tikz_back_bool
 
-\fp_new:N \l_chemmacros_newman_x_fp
-\fp_new:N \l_chemmacros_newman_y_fp
+\fp_new:N \l__chemmacros_newman_x_fp
+\fp_new:N \l__chemmacros_newman_y_fp
 
 \keys_define:nn { chemmacros / newman }
   {
-    ring       .tl_set:N  = \l_chemmacros_newman_tikz_ring_tl ,
-    atoms      .tl_set:N  = \l_chemmacros_newman_tikz_front_tl ,
+    ring       .tl_set:N  = \l__chemmacros_newman_tikz_ring_tl ,
+    atoms      .tl_set:N  = \l__chemmacros_newman_tikz_front_tl ,
     back-atoms .code:n    =
       {
-        \bool_set_true:N \l_chemmacros_newman_tikz_back_bool
-        \tl_set:Nn \l_chemmacros_newman_tikz_back_tl { #1 }
+        \bool_set_true:N \l__chemmacros_newman_tikz_back_bool
+        \tl_set:Nn \l__chemmacros_newman_tikz_back_tl { #1 }
       } ,
-    scale       .fp_set:N  = \l_chemmacros_newman_scale_fp ,
+    scale       .fp_set:N  = \l__chemmacros_newman_scale_fp ,
     scale       .default:n = 1 ,
-    angle       .fp_set:N  = \l_chemmacros_newman_abs_angle_fp ,
+    angle       .fp_set:N  = \l__chemmacros_newman_abs_angle_fp ,
     angle       .default:n = 0
   }
 
 % \newman[<keyval>](<angle>){<1>,<2>,<3>,<4>,<5>,<6>}
-\bool_if:NF \l_chemmacros_version_one_bool
+\bool_if:NF \l__chemmacros_version_one_bool
   {
     \NewDocumentCommand \newman { o d() > { \SplitArgument { 5 } { , } } m }
       {
@@ -2946,10 +2946,10 @@
           \IfNoValueTF { #2 }
             {
               \fp_set_eq:NN
-                \l_chemmacros_newman_rel_angle_fp
-                \l_chemmacros_newman_abs_angle_fp
+                \l__chemmacros_newman_rel_angle_fp
+                \l__chemmacros_newman_abs_angle_fp
             }
-            { \fp_set:Nn \l_chemmacros_newman_rel_angle_fp { #2 } }
+            { \fp_set:Nn \l__chemmacros_newman_rel_angle_fp { #2 } }
           \chemmacros_newman_atoms:nnnnnn #3
         \group_end:
       }
@@ -2960,26 +2960,26 @@
   {
     \chemmacros_tikz_picture:xn
       {
-        scale = \fp_to_tl:N \l_chemmacros_newman_scale_fp ,
+        scale = \fp_to_tl:N \l__chemmacros_newman_scale_fp ,
         chemmacros_newman_atom_front / .style =
           {
             inner~sep=0,
             outer~sep=0,
-            \tl_use:N \l_chemmacros_newman_tikz_front_tl
+            \tl_use:N \l__chemmacros_newman_tikz_front_tl
           },
         chemmacros_newman_atom_back / .style =
           {
             inner~sep=0,
             outer~sep=0,
-            \bool_if:NTF \l_chemmacros_newman_tikz_back_bool
-              { \tl_use:N \l_chemmacros_newman_tikz_back_tl }
-              { \tl_use:N \l_chemmacros_newman_tikz_front_tl }
+            \bool_if:NTF \l__chemmacros_newman_tikz_back_bool
+              { \tl_use:N \l__chemmacros_newman_tikz_back_tl }
+              { \tl_use:N \l__chemmacros_newman_tikz_front_tl }
           }
       }
       {
         \chemmacros_tikz_draw:f
-          { \tl_use:N \l_chemmacros_newman_tikz_ring_tl }
-          (0,0) circle (\fp_to_dim:N \l_chemmacros_newman_scale_fp * 15) ;
+          { \tl_use:N \l__chemmacros_newman_tikz_ring_tl }
+          (0,0) circle (\fp_to_dim:N \l__chemmacros_newman_scale_fp * 15) ;
         \chemmacros_newman_back_node:nf
           { 30 }
           { \IfNoValueF { #5 } { #5 } }
@@ -3005,17 +3005,17 @@
 % #1: angle pi #2: radius
 \cs_new_nopar:Npn \chemmacros_newman_coordinates:nn #1#2
   {
-    \fp_set:Nn \l_chemmacros_newman_tmp_angle_fp { #1 }
-    \fp_div:Nn \l_chemmacros_newman_tmp_angle_fp { 180 }
-    \fp_mul:Nn \l_chemmacros_newman_tmp_angle_fp { \fp_use:N \c_pi_fp }
-    \fp_zero:N \l_chemmacros_newman_x_fp
-    \fp_zero:N \l_chemmacros_newman_y_fp
-    \fp_cos:Nn \l_chemmacros_newman_x_fp
-      { \fp_use:N \l_chemmacros_newman_tmp_angle_fp }
-    \fp_sin:Nn \l_chemmacros_newman_y_fp
-      { \fp_use:N \l_chemmacros_newman_tmp_angle_fp }
-    \fp_mul:Nn \l_chemmacros_newman_x_fp { \fp_use:N #2 }
-    \fp_mul:Nn \l_chemmacros_newman_y_fp { \fp_use:N #2 }
+    \fp_set:Nn \l__chemmacros_newman_tmp_angle_fp { #1 }
+    \fp_div:Nn \l__chemmacros_newman_tmp_angle_fp { 180 }
+    \fp_mul:Nn \l__chemmacros_newman_tmp_angle_fp { \fp_use:N \c_pi_fp }
+    \fp_zero:N \l__chemmacros_newman_x_fp
+    \fp_zero:N \l__chemmacros_newman_y_fp
+    \fp_cos:Nn \l__chemmacros_newman_x_fp
+      { \fp_use:N \l__chemmacros_newman_tmp_angle_fp }
+    \fp_sin:Nn \l__chemmacros_newman_y_fp
+      { \fp_use:N \l__chemmacros_newman_tmp_angle_fp }
+    \fp_mul:Nn \l__chemmacros_newman_x_fp { \fp_use:N #2 }
+    \fp_mul:Nn \l__chemmacros_newman_y_fp { \fp_use:N #2 }
   }
 \cs_generate_variant:Nn \chemmacros_newman_coordinates:nn { on }
 
@@ -3023,33 +3023,33 @@
 \cs_new:Npn \chemmacros_newman_back_node:nn #1#2
   {
     \group_begin:
-      \fp_add:Nn \l_chemmacros_newman_rel_angle_fp { #1 }
+      \fp_add:Nn \l__chemmacros_newman_rel_angle_fp { #1 }
       \chemmacros_newman_coordinates:on
-        { \fp_to_int:N \l_chemmacros_newman_rel_angle_fp }
-        { \l_chemmacros_newman_scale_fp }
+        { \fp_to_int:N \l__chemmacros_newman_rel_angle_fp }
+        { \l__chemmacros_newman_scale_fp }
       \chemmacros_tikz_draw:f
-        { \tl_use:N \l_chemmacros_newman_tikz_ring_tl }
+        { \tl_use:N \l__chemmacros_newman_tikz_ring_tl }
         (
-          15 * \fp_to_dim:N \l_chemmacros_newman_x_fp ,
-          15 * \fp_to_dim:N \l_chemmacros_newman_y_fp
+          15 * \fp_to_dim:N \l__chemmacros_newman_x_fp ,
+          15 * \fp_to_dim:N \l__chemmacros_newman_y_fp
         )
         --
         (
-          30 * \fp_to_dim:N \l_chemmacros_newman_x_fp ,
-          30 * \fp_to_dim:N \l_chemmacros_newman_y_fp
+          30 * \fp_to_dim:N \l__chemmacros_newman_x_fp ,
+          30 * \fp_to_dim:N \l__chemmacros_newman_y_fp
         ) ;
       \chemmacros_newman_coordinates:on
-        { \fp_to_int:N \l_chemmacros_newman_rel_angle_fp }
-        { \l_chemmacros_newman_scale_fp }
+        { \fp_to_int:N \l__chemmacros_newman_rel_angle_fp }
+        { \l__chemmacros_newman_scale_fp }
       \chemmacros_tikz_node:f
         {
           chemmacros_newman_atom_back,
-          anchor = -180 + \fp_to_int:N \l_chemmacros_newman_rel_angle_fp
+          anchor = -180 + \fp_to_int:N \l__chemmacros_newman_rel_angle_fp
         }
         at
         (
-          31 * \fp_to_dim:N \l_chemmacros_newman_x_fp ,
-          31 * \fp_to_dim:N \l_chemmacros_newman_y_fp
+          31 * \fp_to_dim:N \l__chemmacros_newman_x_fp ,
+          31 * \fp_to_dim:N \l__chemmacros_newman_y_fp
         )
         { #2 } ;
     \group_end:
@@ -3059,21 +3059,21 @@
 % place front nodes:
 \cs_new:Npn \chemmacros_newman_front_node:nn #1#2
   {
-    \chemmacros_newman_coordinates:nn { #1 } { \l_chemmacros_newman_scale_fp }
+    \chemmacros_newman_coordinates:nn { #1 } { \l__chemmacros_newman_scale_fp }
     \chemmacros_tikz_draw:f
-      { \tl_use:N \l_chemmacros_newman_tikz_ring_tl }
+      { \tl_use:N \l__chemmacros_newman_tikz_ring_tl }
       (0,0) -- ++
       (
-        30 * \fp_to_dim:N \l_chemmacros_newman_x_fp ,
-        30 * \fp_to_dim:N \l_chemmacros_newman_y_fp
+        30 * \fp_to_dim:N \l__chemmacros_newman_x_fp ,
+        30 * \fp_to_dim:N \l__chemmacros_newman_y_fp
       ) ;
-    \chemmacros_newman_coordinates:nn { #1 } { \l_chemmacros_newman_scale_fp }
+    \chemmacros_newman_coordinates:nn { #1 } { \l__chemmacros_newman_scale_fp }
     \chemmacros_tikz_node:f
       { chemmacros_newman_atom_front, anchor = -180 + #1 }
       at
       (
-        31 * \fp_to_dim:N \l_chemmacros_newman_x_fp ,
-        31 * \fp_to_dim:N \l_chemmacros_newman_y_fp
+        31 * \fp_to_dim:N \l__chemmacros_newman_x_fp ,
+        31 * \fp_to_dim:N \l__chemmacros_newman_y_fp
       )
       { #2 } ;
   }
@@ -3082,147 +3082,147 @@
 % --------------------------------------------------------------------------- %
 % \orbital[<keyval>]{<type>}
 % variables:
-\bool_new:N \l_chemmacros_orbital_type_s_bool
-\bool_new:N \l_chemmacros_orbital_type_p_bool
-\bool_new:N \l_chemmacros_orbital_type_sp_bool
-\bool_new:N \l_chemmacros_orbital_type_sptwo_bool
-\bool_new:N \l_chemmacros_orbital_type_spthree_bool
+\bool_new:N \l__chemmacros_orbital_type_s_bool
+\bool_new:N \l__chemmacros_orbital_type_p_bool
+\bool_new:N \l__chemmacros_orbital_type_sp_bool
+\bool_new:N \l__chemmacros_orbital_type_sptwo_bool
+\bool_new:N \l__chemmacros_orbital_type_spthree_bool
 
-\tl_new:N \l_chemmacros_orbital_s_color_tl
-\tl_set:Nn \l_chemmacros_orbital_s_color_tl { black }
-\tl_new:N \l_chemmacros_orbital_s_phase_color_tl
+\tl_new:N \l__chemmacros_orbital_s_color_tl
+\tl_set:Nn \l__chemmacros_orbital_s_color_tl { black }
+\tl_new:N \l__chemmacros_orbital_s_phase_color_tl
 
-\tl_new:N \l_chemmacros_orbital_p_color_tl
-\tl_set:Nn \l_chemmacros_orbital_p_color_tl { black }
-\tl_new:N \l_chemmacros_orbital_p_pphase_color_tl
-\tl_new:N \l_chemmacros_orbital_p_mphase_color_tl
+\tl_new:N \l__chemmacros_orbital_p_color_tl
+\tl_set:Nn \l__chemmacros_orbital_p_color_tl { black }
+\tl_new:N \l__chemmacros_orbital_p_pphase_color_tl
+\tl_new:N \l__chemmacros_orbital_p_mphase_color_tl
 
-\tl_new:N \l_chemmacros_orbital_sp_color_tl
-\tl_set:Nn \l_chemmacros_orbital_sp_color_tl { black }
-\tl_new:N \l_chemmacros_orbital_sp_pphase_color_tl
-\tl_new:N \l_chemmacros_orbital_sp_mphase_color_tl
+\tl_new:N \l__chemmacros_orbital_sp_color_tl
+\tl_set:Nn \l__chemmacros_orbital_sp_color_tl { black }
+\tl_new:N \l__chemmacros_orbital_sp_pphase_color_tl
+\tl_new:N \l__chemmacros_orbital_sp_mphase_color_tl
 
-\tl_new:N \l_chemmacros_orbital_sptwo_color_tl
-\tl_set:Nn \l_chemmacros_orbital_sptwo_color_tl { black }
-\tl_new:N \l_chemmacros_orbital_sptwo_pphase_color_tl
-\tl_new:N \l_chemmacros_orbital_sptwo_mphase_color_tl
+\tl_new:N \l__chemmacros_orbital_sptwo_color_tl
+\tl_set:Nn \l__chemmacros_orbital_sptwo_color_tl { black }
+\tl_new:N \l__chemmacros_orbital_sptwo_pphase_color_tl
+\tl_new:N \l__chemmacros_orbital_sptwo_mphase_color_tl
 
-\tl_new:N \l_chemmacros_orbital_spthree_color_tl
-\tl_set:Nn \l_chemmacros_orbital_spthree_color_tl { black }
-\tl_new:N \l_chemmacros_orbital_spthree_pphase_color_tl
-\tl_new:N \l_chemmacros_orbital_spthree_mphase_color_tl
+\tl_new:N \l__chemmacros_orbital_spthree_color_tl
+\tl_set:Nn \l__chemmacros_orbital_spthree_color_tl { black }
+\tl_new:N \l__chemmacros_orbital_spthree_pphase_color_tl
+\tl_new:N \l__chemmacros_orbital_spthree_mphase_color_tl
 
-\bool_new:N \l_chemmacros_orbital_s_phase_bool
-\bool_set_true:N \l_chemmacros_orbital_s_phase_bool
+\bool_new:N \l__chemmacros_orbital_s_phase_bool
+\bool_set_true:N \l__chemmacros_orbital_s_phase_bool
 
-\bool_new:N \l_chemmacros_orbital_p_phase_bool
-\bool_set_true:N \l_chemmacros_orbital_p_phase_bool
+\bool_new:N \l__chemmacros_orbital_p_phase_bool
+\bool_set_true:N \l__chemmacros_orbital_p_phase_bool
 
-\bool_new:N \l_chemmacros_orbital_sp_phase_bool
-\bool_set_true:N \l_chemmacros_orbital_sp_phase_bool
+\bool_new:N \l__chemmacros_orbital_sp_phase_bool
+\bool_set_true:N \l__chemmacros_orbital_sp_phase_bool
 
-\bool_new:N \l_chemmacros_orbital_sptwo_phase_bool
-\bool_set_true:N \l_chemmacros_orbital_sptwo_phase_bool
+\bool_new:N \l__chemmacros_orbital_sptwo_phase_bool
+\bool_set_true:N \l__chemmacros_orbital_sptwo_phase_bool
 
-\bool_new:N \l_chemmacros_orbital_spthree_phase_bool
-\bool_set_true:N \l_chemmacros_orbital_spthree_phase_bool
+\bool_new:N \l__chemmacros_orbital_spthree_phase_bool
+\bool_set_true:N \l__chemmacros_orbital_spthree_phase_bool
 
-\tl_new:N \l_chemmacros_orbital_s_scale_tl
-\tl_set:Nn \l_chemmacros_orbital_s_scale_tl { 1 }
+\tl_new:N \l__chemmacros_orbital_s_scale_tl
+\tl_set:Nn \l__chemmacros_orbital_s_scale_tl { 1 }
 
-\tl_new:N \l_chemmacros_orbital_p_scale_tl
-\tl_set:Nn \l_chemmacros_orbital_p_scale_tl { 1 }
+\tl_new:N \l__chemmacros_orbital_p_scale_tl
+\tl_set:Nn \l__chemmacros_orbital_p_scale_tl { 1 }
 
-\tl_new:N \l_chemmacros_orbital_sp_scale_tl
-\tl_set:Nn \l_chemmacros_orbital_sp_scale_tl { 1 }
+\tl_new:N \l__chemmacros_orbital_sp_scale_tl
+\tl_set:Nn \l__chemmacros_orbital_sp_scale_tl { 1 }
 
-\tl_new:N \l_chemmacros_orbital_sptwo_scale_tl
-\tl_set:Nn \l_chemmacros_orbital_sptwo_scale_tl { 1 }
+\tl_new:N \l__chemmacros_orbital_sptwo_scale_tl
+\tl_set:Nn \l__chemmacros_orbital_sptwo_scale_tl { 1 }
 
-\tl_new:N \l_chemmacros_orbital_spthree_scale_tl
-\tl_set:Nn \l_chemmacros_orbital_spthree_scale_tl { 1 }
+\tl_new:N \l__chemmacros_orbital_spthree_scale_tl
+\tl_set:Nn \l__chemmacros_orbital_spthree_scale_tl { 1 }
 
-\fp_new:N \l_chemmacros_orbital_angle_fp
-\fp_set:Nn \l_chemmacros_orbital_angle_fp { 90 }
+\fp_new:N \l__chemmacros_orbital_angle_fp
+\fp_set:Nn \l__chemmacros_orbital_angle_fp { 90 }
 
-\bool_new:N \l_chemmacros_orbital_p_half_bool
-\bool_set_false:N \l_chemmacros_orbital_p_half_bool
+\bool_new:N \l__chemmacros_orbital_p_half_bool
+\bool_set_false:N \l__chemmacros_orbital_p_half_bool
 
-\bool_new:N \l_chemmacros_orbital_overlay_bool
-\bool_set_false:N \l_chemmacros_orbital_overlay_bool
+\bool_new:N \l__chemmacros_orbital_overlay_bool
+\bool_set_false:N \l__chemmacros_orbital_overlay_bool
 
-\bool_new:N \l_chemmacros_orbital_opacity_bool
-\bool_set_false:N \l_chemmacros_opacity_overlay_bool
+\bool_new:N \l__chemmacros_orbital_opacity_bool
+\bool_set_false:N \l__chemmacros_opacity_overlay_bool
 
-\fp_new:N \l_chemmacros_orbital_opacity_fp
-\fp_set:Nn \l_chemmacros_orbital_opacity_fp { 0.5 }
+\fp_new:N \l__chemmacros_orbital_opacity_fp
+\fp_set:Nn \l__chemmacros_orbital_opacity_fp { 0.5 }
 
 \cs_new_nopar:Npn \chemmacros_orbital_options:
   {
     \chemmacros_orbital_overlay: , \chemmacros_orbital_opacity: ,
     inner~sep=0 , outer~sep=0 , line~width=.2pt ,
-    rotate = { \fp_use:N \l_chemmacros_orbital_angle_fp - 90 } ,
+    rotate = { \fp_use:N \l__chemmacros_orbital_angle_fp - 90 } ,
     baseline ,
     minimum~size = 0
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_overlay:
   {
-    \bool_if:NT \l_chemmacros_orbital_overlay_bool { overlay }
+    \bool_if:NT \l__chemmacros_orbital_overlay_bool { overlay }
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_opacity:
   {
-    \bool_if:NT \l_chemmacros_orbital_opacity_bool
-      { opacity = { \fp_use:N \l_chemmacros_orbital_opacity_fp } }
+    \bool_if:NT \l__chemmacros_orbital_opacity_bool
+      { opacity = { \fp_use:N \l__chemmacros_orbital_opacity_fp } }
   }
 
 % --------------------------------------------------------------------------- %
 % s-orbitals
 \cs_new_nopar:Npn \chemmacros_orbital_type_s:
   {
-    \bool_set_true:N \l_chemmacros_orbital_type_s_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_p_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sp_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sptwo_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_spthree_bool
+    \bool_set_true:N \l__chemmacros_orbital_type_s_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_p_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sp_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sptwo_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_spthree_bool
   }
 
 \keys_define:nn { chemmacros / orbital / s }
   {
     phase .choice: ,
     phase / + .code:n =
-      { \bool_set_true:N \l_chemmacros_orbital_s_phase_bool } ,
+      { \bool_set_true:N \l__chemmacros_orbital_s_phase_bool } ,
     phase / - .code:n =
-      { \bool_set_false:N \l_chemmacros_orbital_s_phase_bool } ,
-    scale .tl_set:N   = \l_chemmacros_orbital_s_scale_tl ,
-    color .tl_set:N   = \l_chemmacros_orbital_s_color_tl
+      { \bool_set_false:N \l__chemmacros_orbital_s_phase_bool } ,
+    scale .tl_set:N   = \l__chemmacros_orbital_s_scale_tl ,
+    color .tl_set:N   = \l__chemmacros_orbital_s_color_tl
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_s_draw:n #1
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / orbital / s } { #1 } }
-    \bool_if:NTF \l_chemmacros_orbital_s_phase_bool
+    \bool_if:NTF \l__chemmacros_orbital_s_phase_bool
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_s_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_s_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_s_phase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_s_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_s_phase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_s_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_s_phase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_s_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_s_phase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_s_color_tl ! 90 }
           }
       }
       {
-        \tl_set:Nn \l_chemmacros_orbital_s_phase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_s_phase_color_tl
           { black ! 5 }
       }
     \chemmacros_tikz_picture:xn{ \chemmacros_orbital_options: }
       {
         \chemmacros_tikz_shade:f
-          { ball~color = \l_chemmacros_orbital_s_phase_color_tl }
-          (0,0) circle (\l_chemmacros_orbital_s_scale_tl * .6em) ;
+          { ball~color = \l__chemmacros_orbital_s_phase_color_tl }
+          (0,0) circle (\l__chemmacros_orbital_s_scale_tl * .6em) ;
       }
   }
 
@@ -3230,92 +3230,92 @@
 % p-orbitals
 \cs_new_nopar:Npn \chemmacros_orbital_type_p:
   {
-    \bool_set_false:N \l_chemmacros_orbital_type_s_bool
-    \bool_set_true:N \l_chemmacros_orbital_type_p_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sp_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sptwo_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_spthree_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_s_bool
+    \bool_set_true:N \l__chemmacros_orbital_type_p_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sp_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sptwo_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_spthree_bool
   }
 
 \keys_define:nn { chemmacros / orbital / p }
   {
     phase .choice: ,
     phase / + .code:n =
-      { \bool_set_true:N \l_chemmacros_orbital_p_phase_bool } ,
+      { \bool_set_true:N \l__chemmacros_orbital_p_phase_bool } ,
     phase / - .code:n =
-      { \bool_set_false:N \l_chemmacros_orbital_p_phase_bool } ,
-    scale .tl_set:N   = \l_chemmacros_orbital_p_scale_tl ,
-    angle .fp_set:N   = \l_chemmacros_orbital_angle_fp ,
-    color .tl_set:N   = \l_chemmacros_orbital_p_color_tl ,
-    half  .bool_set:N = \l_chemmacros_orbital_p_half_bool ,
+      { \bool_set_false:N \l__chemmacros_orbital_p_phase_bool } ,
+    scale .tl_set:N   = \l__chemmacros_orbital_p_scale_tl ,
+    angle .fp_set:N   = \l__chemmacros_orbital_angle_fp ,
+    color .tl_set:N   = \l__chemmacros_orbital_p_color_tl ,
+    half  .bool_set:N = \l__chemmacros_orbital_p_half_bool ,
     half  .default:n  = true
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_p_draw:n #1
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / orbital / p } { #1 } }
-    \bool_if:NTF \l_chemmacros_orbital_p_phase_bool
+    \bool_if:NTF \l__chemmacros_orbital_p_phase_bool
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_p_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_p_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_p_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_p_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_p_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_p_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_p_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_p_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_p_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_p_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_p_mphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_p_mphase_color_tl
           { black ! 5 }
         
       }
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_p_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_p_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_p_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_p_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_p_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_p_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_p_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_p_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_p_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_p_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_p_pphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_p_pphase_color_tl
           { black ! 5 }
       }
     \chemmacros_tikz_picture:xn { \chemmacros_orbital_options: }
       {
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_p_pphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_p_pphase_color_tl
+            draw = \l__chemmacros_orbital_p_pphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_p_pphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_p_scale_tl * 2em ,
-            \l_chemmacros_orbital_p_scale_tl * 2em
+            - \l__chemmacros_orbital_p_scale_tl * 2em ,
+            \l__chemmacros_orbital_p_scale_tl * 2em
           )
           and ++
           (
-            \l_chemmacros_orbital_p_scale_tl * 2em ,
-            \l_chemmacros_orbital_p_scale_tl * 2em
+            \l__chemmacros_orbital_p_scale_tl * 2em ,
+            \l__chemmacros_orbital_p_scale_tl * 2em
           )
           .. (0,0);
-        \bool_if:NF \l_chemmacros_orbital_p_half_bool
+        \bool_if:NF \l__chemmacros_orbital_p_half_bool
           {
             \chemmacros_tikz_shadedraw:f
               {
-                draw = \l_chemmacros_orbital_p_mphase_color_tl ,
-                ball~color = \l_chemmacros_orbital_p_mphase_color_tl
+                draw = \l__chemmacros_orbital_p_mphase_color_tl ,
+                ball~color = \l__chemmacros_orbital_p_mphase_color_tl
               }
               (0,0) .. controls ++
               (
-                - \l_chemmacros_orbital_p_scale_tl * 2em ,
-                - \l_chemmacros_orbital_p_scale_tl * 2em
+                - \l__chemmacros_orbital_p_scale_tl * 2em ,
+                - \l__chemmacros_orbital_p_scale_tl * 2em
               )
               and ++
               (
-                \l_chemmacros_orbital_p_scale_tl * 2em ,
-                - \l_chemmacros_orbital_p_scale_tl * 2em
+                \l__chemmacros_orbital_p_scale_tl * 2em ,
+                - \l__chemmacros_orbital_p_scale_tl * 2em
               )
               .. (0,0);
           }
@@ -3326,88 +3326,88 @@
 % sp-orbitals
 \cs_new_nopar:Npn \chemmacros_orbital_type_sp:
   {
-    \bool_set_false:N \l_chemmacros_orbital_type_s_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_p_bool
-    \bool_set_true:N \l_chemmacros_orbital_type_sp_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sptwo_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_spthree_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_s_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_p_bool
+    \bool_set_true:N \l__chemmacros_orbital_type_sp_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sptwo_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_spthree_bool
   }
 
 \keys_define:nn { chemmacros / orbital / sp }
   {
     phase .choice: ,
     phase / + .code:n =
-      { \bool_set_true:N \l_chemmacros_orbital_sp_phase_bool } ,
+      { \bool_set_true:N \l__chemmacros_orbital_sp_phase_bool } ,
     phase / - .code:n =
-      { \bool_set_false:N \l_chemmacros_orbital_sp_phase_bool } ,
-    scale .tl_set:N   = \l_chemmacros_orbital_sp_scale_tl ,
-    angle .fp_set:N   = \l_chemmacros_orbital_angle_fp ,
-    color .tl_set:N   = \l_chemmacros_orbital_sp_color_tl
+      { \bool_set_false:N \l__chemmacros_orbital_sp_phase_bool } ,
+    scale .tl_set:N   = \l__chemmacros_orbital_sp_scale_tl ,
+    angle .fp_set:N   = \l__chemmacros_orbital_angle_fp ,
+    color .tl_set:N   = \l__chemmacros_orbital_sp_color_tl
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_sp_draw:n #1
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / orbital / sp } { #1 } }
-    \bool_if:NTF \l_chemmacros_orbital_sp_phase_bool
+    \bool_if:NTF \l__chemmacros_orbital_sp_phase_bool
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_sp_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_sp_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sp_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sp_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_sp_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sp_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sp_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sp_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_sp_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sp_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_sp_mphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_sp_mphase_color_tl
           { black ! 5 }
         
       }
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_sp_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_sp_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sp_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sp_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_sp_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sp_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sp_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sp_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_sp_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sp_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_sp_pphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_sp_pphase_color_tl
           { black ! 5 }
       }
     \chemmacros_tikz_picture:xn { \chemmacros_orbital_options: }
       {
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_sp_pphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_sp_pphase_color_tl
+            draw = \l__chemmacros_orbital_sp_pphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_sp_pphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_sp_scale_tl * 2em ,
-            \l_chemmacros_orbital_sp_scale_tl * 2em
+            - \l__chemmacros_orbital_sp_scale_tl * 2em ,
+            \l__chemmacros_orbital_sp_scale_tl * 2em
           )
           and ++
           (
-            \l_chemmacros_orbital_sp_scale_tl * 2em ,
-            \l_chemmacros_orbital_sp_scale_tl * 2em
+            \l__chemmacros_orbital_sp_scale_tl * 2em ,
+            \l__chemmacros_orbital_sp_scale_tl * 2em
           )
           .. (0,0);
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_sp_mphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_sp_mphase_color_tl
+            draw = \l__chemmacros_orbital_sp_mphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_sp_mphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_sp_scale_tl * .6em ,
-            - \l_chemmacros_orbital_sp_scale_tl * .6em
+            - \l__chemmacros_orbital_sp_scale_tl * .6em ,
+            - \l__chemmacros_orbital_sp_scale_tl * .6em
           )
           and ++
           (
-            \l_chemmacros_orbital_sp_scale_tl * .6em ,
-            - \l_chemmacros_orbital_sp_scale_tl * .6em
+            \l__chemmacros_orbital_sp_scale_tl * .6em ,
+            - \l__chemmacros_orbital_sp_scale_tl * .6em
           )
           .. (0,0);
       }
@@ -3417,88 +3417,88 @@
 % sp2-orbitals
 \cs_new_nopar:Npn \chemmacros_orbital_type_sptwo:
   {
-    \bool_set_false:N \l_chemmacros_orbital_type_s_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_p_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sp_bool
-    \bool_set_true:N \l_chemmacros_orbital_type_sptwo_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_spthree_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_s_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_p_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sp_bool
+    \bool_set_true:N \l__chemmacros_orbital_type_sptwo_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_spthree_bool
   }
 
 \keys_define:nn { chemmacros / orbital / sp2 }
   {
     phase .choice: ,
     phase / + .code:n =
-      { \bool_set_true:N \l_chemmacros_orbital_sptwo_phase_bool } ,
+      { \bool_set_true:N \l__chemmacros_orbital_sptwo_phase_bool } ,
     phase / - .code:n =
-      { \bool_set_false:N \l_chemmacros_orbital_sptwo_phase_bool } ,
-    scale .tl_set:N   = \l_chemmacros_orbital_sptwo_scale_tl ,
-    angle .fp_set:N   = \l_chemmacros_orbital_angle_fp ,
-    color .tl_set:N   = \l_chemmacros_orbital_sptwo_color_tl
+      { \bool_set_false:N \l__chemmacros_orbital_sptwo_phase_bool } ,
+    scale .tl_set:N   = \l__chemmacros_orbital_sptwo_scale_tl ,
+    angle .fp_set:N   = \l__chemmacros_orbital_angle_fp ,
+    color .tl_set:N   = \l__chemmacros_orbital_sptwo_color_tl
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_sptwo_draw:n #1
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / orbital / sp2 } { #1 } }
-    \bool_if:NTF \l_chemmacros_orbital_sptwo_phase_bool
+    \bool_if:NTF \l__chemmacros_orbital_sptwo_phase_bool
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_sptwo_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_sptwo_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sptwo_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sptwo_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_sptwo_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sptwo_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sptwo_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sptwo_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_sptwo_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sptwo_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_sptwo_mphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_sptwo_mphase_color_tl
           { black ! 5 }
         
       }
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_sptwo_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_sptwo_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sptwo_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sptwo_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_sptwo_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sptwo_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_sptwo_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_sptwo_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_sptwo_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_sptwo_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_sptwo_pphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_sptwo_pphase_color_tl
           { black ! 5 }
       }
     \chemmacros_tikz_picture:xn { \chemmacros_orbital_options: }
       {
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_sptwo_pphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_sptwo_pphase_color_tl
+            draw = \l__chemmacros_orbital_sptwo_pphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_sptwo_pphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_sptwo_scale_tl * 2em ,
-            \l_chemmacros_orbital_sptwo_scale_tl * 2em
+            - \l__chemmacros_orbital_sptwo_scale_tl * 2em ,
+            \l__chemmacros_orbital_sptwo_scale_tl * 2em
           )
           and ++
           (
-            \l_chemmacros_orbital_sptwo_scale_tl * 2em ,
-            \l_chemmacros_orbital_sptwo_scale_tl * 2em
+            \l__chemmacros_orbital_sptwo_scale_tl * 2em ,
+            \l__chemmacros_orbital_sptwo_scale_tl * 2em
           )
           .. (0,0);
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_sptwo_mphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_sptwo_mphase_color_tl
+            draw = \l__chemmacros_orbital_sptwo_mphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_sptwo_mphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_sptwo_scale_tl * .8em ,
-            - \l_chemmacros_orbital_sptwo_scale_tl * .8em
+            - \l__chemmacros_orbital_sptwo_scale_tl * .8em ,
+            - \l__chemmacros_orbital_sptwo_scale_tl * .8em
           )
           and ++
           (
-            \l_chemmacros_orbital_sptwo_scale_tl * .8em ,
-            - \l_chemmacros_orbital_sptwo_scale_tl * .8em
+            \l__chemmacros_orbital_sptwo_scale_tl * .8em ,
+            - \l__chemmacros_orbital_sptwo_scale_tl * .8em
           )
           .. (0,0);
       }
@@ -3508,88 +3508,88 @@
 % sp3-orbitals
 \cs_new_nopar:Npn \chemmacros_orbital_type_spthree:
   {
-    \bool_set_false:N \l_chemmacros_orbital_type_s_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_p_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sp_bool
-    \bool_set_false:N \l_chemmacros_orbital_type_sptwo_bool
-    \bool_set_true:N \l_chemmacros_orbital_type_spthree_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_s_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_p_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sp_bool
+    \bool_set_false:N \l__chemmacros_orbital_type_sptwo_bool
+    \bool_set_true:N \l__chemmacros_orbital_type_spthree_bool
   }
 
 \keys_define:nn { chemmacros / orbital / sp3 }
   {
     phase .choice: ,
     phase / + .code:n =
-      { \bool_set_true:N \l_chemmacros_orbital_spthree_phase_bool } ,
+      { \bool_set_true:N \l__chemmacros_orbital_spthree_phase_bool } ,
     phase / - .code:n =
-     { \bool_set_false:N \l_chemmacros_orbital_spthree_phase_bool } ,
-    scale .tl_set:N   = \l_chemmacros_orbital_spthree_scale_tl ,
-    angle .fp_set:N   = \l_chemmacros_orbital_angle_fp ,
-    color .tl_set:N   = \l_chemmacros_orbital_spthree_color_tl
+     { \bool_set_false:N \l__chemmacros_orbital_spthree_phase_bool } ,
+    scale .tl_set:N   = \l__chemmacros_orbital_spthree_scale_tl ,
+    angle .fp_set:N   = \l__chemmacros_orbital_angle_fp ,
+    color .tl_set:N   = \l__chemmacros_orbital_spthree_color_tl
   }
 
 \cs_new_nopar:Npn \chemmacros_orbital_spthree_draw:n #1
   {
     \IfNoValueF { #1 } { \keys_set:nn { chemmacros / orbital / sp3 } { #1 } }
-    \bool_if:NTF \l_chemmacros_orbital_spthree_phase_bool
+    \bool_if:NTF \l__chemmacros_orbital_spthree_phase_bool
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_spthree_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_spthree_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_spthree_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_spthree_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_spthree_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_spthree_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_spthree_pphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_spthree_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_spthree_pphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_spthree_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_spthree_mphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_spthree_mphase_color_tl
           { black ! 5 }
         
       }
       {
-        \tl_if_in:NnTF \l_chemmacros_orbital_spthree_color_tl { ! }
+        \tl_if_in:NnTF \l__chemmacros_orbital_spthree_color_tl { ! }
           {
-            \tl_set:Nn \l_chemmacros_orbital_spthree_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_spthree_color_tl }
+            \tl_set:Nn \l__chemmacros_orbital_spthree_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_spthree_color_tl }
           }
           {
-            \tl_set:Nn \l_chemmacros_orbital_spthree_mphase_color_tl
-              { \tl_use:N \l_chemmacros_orbital_spthree_color_tl ! 90 }
+            \tl_set:Nn \l__chemmacros_orbital_spthree_mphase_color_tl
+              { \tl_use:N \l__chemmacros_orbital_spthree_color_tl ! 90 }
           }
-        \tl_set:Nn \l_chemmacros_orbital_spthree_pphase_color_tl
+        \tl_set:Nn \l__chemmacros_orbital_spthree_pphase_color_tl
           { black ! 5 }
       }
     \chemmacros_tikz_picture:xn { \chemmacros_orbital_options: }
       {
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_spthree_pphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_spthree_pphase_color_tl
+            draw = \l__chemmacros_orbital_spthree_pphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_spthree_pphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_spthree_scale_tl * 2em ,
-            \l_chemmacros_orbital_spthree_scale_tl * 2em
+            - \l__chemmacros_orbital_spthree_scale_tl * 2em ,
+            \l__chemmacros_orbital_spthree_scale_tl * 2em
           )
           and ++
           (
-            \l_chemmacros_orbital_spthree_scale_tl * 2em ,
-            \l_chemmacros_orbital_spthree_scale_tl * 2em
+            \l__chemmacros_orbital_spthree_scale_tl * 2em ,
+            \l__chemmacros_orbital_spthree_scale_tl * 2em
           )
           .. (0,0);
         \chemmacros_tikz_shadedraw:f
           {
-            draw = \l_chemmacros_orbital_spthree_mphase_color_tl ,
-            ball~color = \l_chemmacros_orbital_spthree_mphase_color_tl
+            draw = \l__chemmacros_orbital_spthree_mphase_color_tl ,
+            ball~color = \l__chemmacros_orbital_spthree_mphase_color_tl
           }
           (0,0) .. controls ++
           (
-            - \l_chemmacros_orbital_spthree_scale_tl * 1em ,
-            - \l_chemmacros_orbital_spthree_scale_tl * 1em
+            - \l__chemmacros_orbital_spthree_scale_tl * 1em ,
+            - \l__chemmacros_orbital_spthree_scale_tl * 1em
           )
           and ++
           (
-            \l_chemmacros_orbital_spthree_scale_tl * 1em ,
-            - \l_chemmacros_orbital_spthree_scale_tl * 1em
+            \l__chemmacros_orbital_spthree_scale_tl * 1em ,
+            - \l__chemmacros_orbital_spthree_scale_tl * 1em
           )
           .. (0,0);
       }
@@ -3599,14 +3599,14 @@
 % main command
 \keys_define:nn { chemmacros / orbital }
   {
-    overlay .bool_set:N = \l_chemmacros_orbital_overlay_bool ,
+    overlay .bool_set:N = \l__chemmacros_orbital_overlay_bool ,
     overlay .default:n  = true ,
     opacity .code:n     =
       {
         \fp_compare:nTF { #1 = 1 }
-          { \bool_set_false:N \l_chemmacros_orbital_opacity_bool }
-          { \bool_set_true:N \l_chemmacros_orbital_opacity_bool }
-        \fp_set:Nn \l_chemmacros_orbital_opacity_fp { #1 }
+          { \bool_set_false:N \l__chemmacros_orbital_opacity_bool }
+          { \bool_set_true:N \l__chemmacros_orbital_opacity_bool }
+        \fp_set:Nn \l__chemmacros_orbital_opacity_fp { #1 }
       }
   }
 
@@ -3623,33 +3623,33 @@
   {
     \group_begin:
       \keys_set:nn { chemmacros / orbital / type } { #2 }
-      \bool_if:NT \l_chemmacros_orbital_type_s_bool
+      \bool_if:NT \l__chemmacros_orbital_type_s_bool
         { \chemmacros_orbital_s_draw:n { #1 } }
-      \bool_if:NT \l_chemmacros_orbital_type_p_bool
+      \bool_if:NT \l__chemmacros_orbital_type_p_bool
         { \chemmacros_orbital_p_draw:n { #1 } }
-      \bool_if:NT \l_chemmacros_orbital_type_sp_bool
+      \bool_if:NT \l__chemmacros_orbital_type_sp_bool
         { \chemmacros_orbital_sp_draw:n { #1 } }
-      \bool_if:NT \l_chemmacros_orbital_type_sptwo_bool
+      \bool_if:NT \l__chemmacros_orbital_type_sptwo_bool
         { \chemmacros_orbital_sptwo_draw:n { #1 } }
-      \bool_if:NT \l_chemmacros_orbital_type_spthree_bool
+      \bool_if:NT \l__chemmacros_orbital_type_spthree_bool
         { \chemmacros_orbital_spthree_draw:n { #1 } }
     \group_end:
   }
 
 % --------------------------------------------------------------------------- %
 % arrow tips for electron movement
-\dim_new:N \l_chemmacros_el_length_dim
+\dim_new:N \l__chemmacros_el_length_dim
 
 % full tip for pairs
 \pgfarrowsdeclare { el } { el }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemmacros_el_length_dim }
+  \pgfarrowsleftextend { -\l__chemmacros_el_length_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -3658,16 +3658,16 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemmacros_el_length_dim }
-        { .3\l_chemmacros_el_length_dim }
+        { -\l__chemmacros_el_length_dim }
+        { .3\l__chemmacros_el_length_dim }
     }
   \pgfpathlineto
-    { \pgfpoint { -.5\l_chemmacros_el_length_dim } { 0pt } }
+    { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } }
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemmacros_el_length_dim }
-        { -.3\l_chemmacros_el_length_dim }
+        { -\l__chemmacros_el_length_dim }
+        { -.3\l__chemmacros_el_length_dim }
     }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
@@ -3676,13 +3676,13 @@
 % half tip on the left
 \pgfarrowsdeclare { left~el } { left~el }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemmacros_el_length_dim }
+  \pgfarrowsleftextend { -\l__chemmacros_el_length_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -3691,10 +3691,10 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemmacros_el_length_dim }
-        { .3\l_chemmacros_el_length_dim }
+        { -\l__chemmacros_el_length_dim }
+        { .3\l__chemmacros_el_length_dim }
     }
-  \pgfpathlineto { \pgfpoint { -.5\l_chemmacros_el_length_dim } { 0pt } }
+  \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
 }
@@ -3702,13 +3702,13 @@
 % half tip in the right
 \pgfarrowsdeclare { right~el } { right~el }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
-  \pgfarrowsleftextend { -\l_chemmacros_el_length_dim }
+  \pgfarrowsleftextend { -\l__chemmacros_el_length_dim }
   \pgfarrowsrightextend { .5\pgflinewidth }
 }
 {
-  \dim_set:Nn \l_chemmacros_el_length_dim
+  \dim_set:Nn \l__chemmacros_el_length_dim
     { 2.5pt + 2.5\pgflinewidth }
   \pgfsetdash {} { 0pt }
   \pgfsetroundjoin
@@ -3717,10 +3717,10 @@
   \pgfpathlineto
     {
       \pgfpoint
-        { -\l_chemmacros_el_length_dim }
-        { -.3\l_chemmacros_el_length_dim }
+        { -\l__chemmacros_el_length_dim }
+        { -.3\l__chemmacros_el_length_dim }
     }
-  \pgfpathlineto { \pgfpoint { -.5\l_chemmacros_el_length_dim } { 0pt } }
+  \pgfpathlineto { \pgfpoint { -.5\l__chemmacros_el_length_dim } { 0pt } }
   \pgfpathlineto { \pgfpoint { 0pt } { 0pt } }
   \pgfusepathqfillstroke
 }
@@ -3737,7 +3737,7 @@
 
 % --------------------------------------------------------------------------- %
 % load old definitions:
-\bool_if:NT \l_chemmacros_version_one_bool
+\bool_if:NT \l__chemmacros_version_one_bool
   {
     \input { chemmacros-version1 . cfg }
   }
@@ -3886,9 +3886,12 @@ Version history
                           - radical point thicker, new options `radical-style'
                             and `radical-radius'
 2012/10/03 - version 3.4a - bug fix in coupling constant \J
+2013/01/04 - version 3.4b - bug fix in the sub- and superscript handling
 
 % --------------------------------------------------------------------------- %
 % TODO:
 - ox-option xfrac vs math?
 - drop option `bpchem'
-- add d-orbitals
\ No newline at end of file
+- add d-orbitals
+- add kpfonts to `greek' option so \Chemalpha and kin use \alphaup ... of kpfonts
+  package
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
index d7543028d16..e7e4a25ff0d 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
+++ b/Master/texmf-dist/tex/latex/chemmacros/ghsystem.sty
@@ -12,7 +12,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -64,10 +64,10 @@
 
 % --------------------------------------------------------------------------- %
 % scratch variables
-\tl_new:N  \l_ghsystem_tmpa_tl
-\tl_new:N  \l_ghsystem_tmpb_tl
-\int_new:N \l_ghsystem_tmpa_int
-\int_new:N \l_ghsystem_tmpb_int
+\tl_new:N  \l__ghsystem_tmpa_tl
+\tl_new:N  \l__ghsystem_tmpb_tl
+\int_new:N \l__ghsystem_tmpa_int
+\int_new:N \l__ghsystem_tmpb_int
 
 % --------------------------------------------------------------------------- %
 % gobble options
@@ -79,9 +79,9 @@
 
 % --------------------------------------------------------------------------- %
 % define variables:
-\prop_new:N \l_ghsystem_h_prop
-\prop_new:N \l_ghsystem_euh_prop
-\prop_new:N \l_ghsystem_p_prop
+\prop_new:N \l__ghsystem_h_prop
+\prop_new:N \l__ghsystem_euh_prop
+\prop_new:N \l__ghsystem_p_prop
 
 \cs_new:Npn \ghsystem_exposure: {}
 \cs_new:Npn \ghsystem_effect: {}
@@ -89,49 +89,49 @@
 \cs_new:Npn \ghsystem_substance: {}
 \cs_new:Npn \ghsystem_text: {}
 
-\bool_new:N \l_ghsystem_fill_in_bool
-\bool_new:N \l_ghsystem_show_number_bool
-\bool_new:N \l_ghsystem_substance_bool
-\bool_new:N \l_ghsystem_organs_bool
-\bool_new:N \l_ghsystem_hide_statement_bool
-\bool_new:N \l_ghsystem_engine_pdftex_bool
-\bool_new:N \l_ghsystem_engine_xetex_bool
-\bool_new:N \l_ghsystem_engine_luatex_bool
-
-\tl_new:N \l_ghsystem_number_space_tl
-\tl_new:N \l_ghsystem_celsius_temperature_tl
-\tl_new:N \l_ghsystem_fahrenheit_temperature_tl
-\tl_new:N \l_ghsystem_kg_mass_tl
-\tl_new:N \l_ghsystem_lbs_mass_tl
-\tl_new:N \l_ghsystem_dots_tl
-\tl_set:Nn \l_ghsystem_dots_tl { \ldots }
-\tl_new:N \l_ghsystem_picture_scale_default_tl
-\tl_set:Nn \l_ghsystem_picture_scale_default_tl { .05 }
-\tl_new:N \l_ghsystem_picture_scale_tl
-\tl_set_eq:NN \l_ghsystem_picture_scale_tl \l_ghsystem_picture_scale_default_tl
-\tl_new:N \l_ghsystem_picture_includegraphics_tl
-\tl_new:N \l_ghsystem_picture_type_tl
-\tl_new:N \l_ghsystem_identifier_tl
-\tl_new:N \l_ghsystem_table_text_tl
-\tl_new:N \l_ghsystem_table_next_page_tl
-\tl_new:N \l_ghsystem_table_head_rule_tl
-\tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline }
-\tl_new:N \l_ghsystem_table_top_head_rule_tl
-\tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline }
-\tl_new:N \l_ghsystem_table_foot_rule_tl
-\tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline }
-\tl_new:N \l_ghsystem_table_last_foot_rule_tl
-\tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline }
-\tl_new:N \l_ghsystem_table_caption_tl
-\tl_new:N \l_ghsystem_table_caption_short_tl
-\tl_new:N \l_ghsystem_table_label_tl
-\tl_set:Nn \l_ghsystem_table_label_tl { tab : ghs-hp-statements }
-
-\dim_new:N \l_ghsystem_table_line_sep_dim
-\dim_set:Nn \l_ghsystem_table_line_sep_dim { 3pt }
-
-\fp_new:N \l_ghsystem_picture_scale_fp
-\fp_set:Nn \l_ghsystem_picture_scale_fp { \l_ghsystem_picture_scale_tl }
+\bool_new:N \l__ghsystem_fill_in_bool
+\bool_new:N \l__ghsystem_show_number_bool
+\bool_new:N \l__ghsystem_substance_bool
+\bool_new:N \l__ghsystem_organs_bool
+\bool_new:N \l__ghsystem_hide_statement_bool
+\bool_new:N \l__ghsystem_engine_pdftex_bool
+\bool_new:N \l__ghsystem_engine_xetex_bool
+\bool_new:N \l__ghsystem_engine_luatex_bool
+
+\tl_new:N \l__ghsystem_number_space_tl
+\tl_new:N \l__ghsystem_celsius_temperature_tl
+\tl_new:N \l__ghsystem_fahrenheit_temperature_tl
+\tl_new:N \l__ghsystem_kg_mass_tl
+\tl_new:N \l__ghsystem_lbs_mass_tl
+\tl_new:N \l__ghsystem_dots_tl
+\tl_set:Nn \l__ghsystem_dots_tl { \ldots }
+\tl_new:N \l__ghsystem_picture_scale_default_tl
+\tl_set:Nn \l__ghsystem_picture_scale_default_tl { .05 }
+\tl_new:N \l__ghsystem_picture_scale_tl
+\tl_set_eq:NN \l__ghsystem_picture_scale_tl \l__ghsystem_picture_scale_default_tl
+\tl_new:N \l__ghsystem_picture_includegraphics_tl
+\tl_new:N \l__ghsystem_picture_type_tl
+\tl_new:N \l__ghsystem_identifier_tl
+\tl_new:N \l__ghsystem_table_text_tl
+\tl_new:N \l__ghsystem_table_next_page_tl
+\tl_new:N \l__ghsystem_table_head_rule_tl
+\tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline }
+\tl_new:N \l__ghsystem_table_top_head_rule_tl
+\tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline }
+\tl_new:N \l__ghsystem_table_foot_rule_tl
+\tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline }
+\tl_new:N \l__ghsystem_table_last_foot_rule_tl
+\tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline }
+\tl_new:N \l__ghsystem_table_caption_tl
+\tl_new:N \l__ghsystem_table_caption_short_tl
+\tl_new:N \l__ghsystem_table_label_tl
+\tl_set:Nn \l__ghsystem_table_label_tl { tab : ghs-hp-statements }
+
+\dim_new:N \l__ghsystem_table_line_sep_dim
+\dim_set:Nn \l__ghsystem_table_line_sep_dim { 3pt }
+
+\fp_new:N \l__ghsystem_picture_scale_fp
+\fp_set:Nn \l__ghsystem_picture_scale_fp { \l__ghsystem_picture_scale_tl }
 
 \DeclareSIUnit { \GHSfahrenheit } { \SIUnitSymbolDegree F }
 \DeclareSIUnit { \GHScelsius } { \SIUnitSymbolDegree C }
@@ -139,21 +139,21 @@
 \DeclareSIUnit { \GHSpounds } { lbs }
 
 % language settings
-\bool_new:N \l_ghsystem_language_file_loaded_bool
-\bool_new:N \l_ghsystem_language_directory_bool
+\bool_new:N \l__ghsystem_language_file_loaded_bool
+\bool_new:N \l__ghsystem_language_directory_bool
 \file_if_exist:nTF { language / ghsystem_english_def }
-  { \bool_set_true:N \l_ghsystem_language_directory_bool }
-  { \bool_set_false:N \l_ghsystem_language_directory_bool }
+  { \bool_set_true:N \l__ghsystem_language_directory_bool }
+  { \bool_set_false:N \l__ghsystem_language_directory_bool }
 
-\bool_if:NTF \l_ghsystem_language_directory_bool
+\bool_if:NTF \l__ghsystem_language_directory_bool
   {
-    \prop_map_inline:Nn \l_chemmacros_language_prop
+    \prop_map_inline:Nn \l__chemmacros_language_prop
       {
         \bool_if:cT { l_chemmacros_#1_bool }
           {
             \file_if_exist:nTF { language / ghsystem_#2.def }
               {
-                \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+                \bool_set_true:N \l__ghsystem_language_file_loaded_bool
                 \input { language / ghsystem_#2.def } \ExplSyntaxOn
               }
               { \input { language / ghsystem_english.def } \ExplSyntaxOn }
@@ -161,13 +161,13 @@
       }
   }
   {
-    \prop_map_inline:Nn \l_chemmacros_language_prop
+    \prop_map_inline:Nn \l__chemmacros_language_prop
       {
         \bool_if:cT { l_chemmacros_#1_bool }
           {
             \file_if_exist:nTF { ghsystem_#2.def }
               {
-                \bool_set_true:N \l_ghsystem_language_file_loaded_bool
+                \bool_set_true:N \l__ghsystem_language_file_loaded_bool
                 \input { ghsystem_#2.def } \ExplSyntaxOn
               }
               { \input { ghsystem_english.def } \ExplSyntaxOn }
@@ -175,9 +175,9 @@
       }
   }
 
-\bool_if:NF \l_ghsystem_language_file_loaded_bool
+\bool_if:NF \l__ghsystem_language_file_loaded_bool
   {
-    \bool_if:NTF \l_ghsystem_language_directory_bool
+    \bool_if:NTF \l__ghsystem_language_directory_bool
       { \input { language / ghsystem_english.def } \ExplSyntaxOn }
       { \input { ghsystem_english.def } \ExplSyntaxOn }
   }
@@ -194,104 +194,104 @@
   {
     % general options:
     language                        .code:n     =
-      \bool_set_true:c { l_ghsystem_#1_bool }
-      \bool_if:NTF \l_ghsystem_language_directory_bool
+      \bool_set_true:c { l__ghsystem_#1_bool }
+      \bool_if:NTF \l__ghsystem_language_directory_bool
         { \input { language / ghsystem_#1.def } \ExplSyntaxOn }
         { \input { ghsystem_#1.def } \ExplSyntaxOn } ,
     % \ghs options:
     hide                            .bool_set:N =
-      \l_ghsystem_hide_statement_bool ,
+      \l__ghsystem_hide_statement_bool ,
     hide                            .default:n  = true ,
-    fill-in                         .bool_set:N = \l_ghsystem_fill_in_bool ,
+    fill-in                         .bool_set:N = \l__ghsystem_fill_in_bool ,
     fill-in                         .default:n  = true ,
     exposure                        .code:n     =
       \cs_set:Npn \ghsystem_exposure: { ~ #1 } ,
     effect                          .code:n     =
       \cs_set:Npn \ghsystem_effect: { ~ #1 } ,
     organs                          .code:n     =
-      \bool_set_true:N \l_ghsystem_organs_bool
+      \bool_set_true:N \l__ghsystem_organs_bool
       \cs_set:Npn \ghsystem_organs: { ~ #1 } ,
     substance                       .code:n     =
-      \bool_set_true:N \l_ghsystem_substance_bool
+      \bool_set_true:N \l__ghsystem_substance_bool
       \cs_set:Npn \ghsystem_substance: { ~ #1 } ,
     text                            .code:n     =
       \cs_set:Npn \ghsystem_text: { ~ #1 } ,
     space                           .tl_set:N   =
-      \l_ghsystem_number_space_tl ,
+      \l__ghsystem_number_space_tl ,
     C-temperature                   .tl_set:N   =
-      \l_ghsystem_celsius_temperature_tl ,
+      \l__ghsystem_celsius_temperature_tl ,
     F-temperature                   .tl_set:N   =
-      \l_ghsystem_fahrenheit_temperature_tl ,
-    kg-mass                         .tl_set:N   = \l_ghsystem_kg_mass_tl ,
-    lbs-mass                        .tl_set:N   = \l_ghsystem_lbs_mass_tl ,
-    dots                            .tl_set:N   = \l_ghsystem_dots_tl ,
+      \l__ghsystem_fahrenheit_temperature_tl ,
+    kg-mass                         .tl_set:N   = \l__ghsystem_kg_mass_tl ,
+    lbs-mass                        .tl_set:N   = \l__ghsystem_lbs_mass_tl ,
+    dots                            .tl_set:N   = \l__ghsystem_dots_tl ,
     % \ghspic options:
     scale                           .code:n     =
-      \fp_mul:Nn \l_ghsystem_picture_scale_fp { #1 } ,
+      \fp_mul:Nn \l__ghsystem_picture_scale_fp { #1 } ,
     includegraphics                 .code:n     =
-      \tl_set:Nn \l_ghsystem_picture_includegraphics_tl { , #1 } ,
+      \tl_set:Nn \l__ghsystem_picture_includegraphics_tl { , #1 } ,
     pic-type                        .choices:nn = { eps , jpg , png , pdf }
-      { \tl_set_eq:NN \l_ghsystem_picture_type_tl \l_keys_choice_tl } ,
+      { \tl_set_eq:NN \l__ghsystem_picture_type_tl \l_keys_choice_tl } ,
     % \ghslistall options:
-    table-head-number               .tl_set:N   = \l_ghsystem_identifier_tl ,
-    table-head-text                 .tl_set:N   = \l_ghsystem_table_text_tl ,
+    table-head-number               .tl_set:N   = \l__ghsystem_identifier_tl ,
+    table-head-text                 .tl_set:N   = \l__ghsystem_table_text_tl ,
     table-next-page                 .tl_set:N   =
-      \l_ghsystem_table_next_page_tl ,
+      \l__ghsystem_table_next_page_tl ,
     table-row-sep                   .dim_set:N  =
-      \l_ghsystem_table_line_sep_dim ,
+      \l__ghsystem_table_line_sep_dim ,
     table-head-rule                 .choice: ,
     table-head-rule / default       .code:n     =
-      \tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline } ,
+      \tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline } ,
     table-head-rule / booktabs      .code:n     =
       \ghsystem_booktabs:n { table-head-rule }
-      \tl_set:Nn \l_ghsystem_table_head_rule_tl { \midrule } ,
+      \tl_set:Nn \l__ghsystem_table_head_rule_tl { \midrule } ,
     table-head-rule / none          .code:n     =
-      \tl_clear:N \l_ghsystem_table_head_rule_tl ,
+      \tl_clear:N \l__ghsystem_table_head_rule_tl ,
     table-top-head-rule             .choice: ,
     table-top-head-rule / default   .code:n     =
-      \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline } ,
+      \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline } ,
     table-top-head-rule / booktabs  .code:n     =
       \ghsystem_booktabs:n { table-top-head-rule }
-      \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \toprule } ,
+      \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \toprule } ,
     table-top-head-rule / none      .code:n     =
-      \tl_clear:N \l_ghsystem_table_top_head_rule_tl ,
+      \tl_clear:N \l__ghsystem_table_top_head_rule_tl ,
     table-foot-rule                 .choice: ,
     table-foot-rule / default       .code:n     =
-      \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline } ,
+      \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline } ,
     table-foot-rule / booktabs      .code:n     =
       \ghsystem_booktabs:n { table-foot-rule }
-      \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \midrule } ,
+      \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \midrule } ,
     table-foot-rule / none          .code:n     =
-      \tl_clear:N \l_ghsystem_table_foot_rule_tl ,
+      \tl_clear:N \l__ghsystem_table_foot_rule_tl ,
     table-last-foot-rule            .choice: ,
     table-last-foot-rule / default  .code:n     =
-      \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline } ,
+      \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline } ,
     table-last-foot-rule / booktabs .code:n     =
       \ghsystem_booktabs:n { table-last-foot-rule }
-      \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \bottomrule } ,
+      \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \bottomrule } ,
     table-last-foot-rule / none     .code:n     =
-      \tl_clear:N \l_ghsystem_table_last_foot_rule_tl ,
+      \tl_clear:N \l__ghsystem_table_last_foot_rule_tl ,
     table-rules                     .choice: ,
     table-rules / default           .code:n     =
-      \tl_set:Nn \l_ghsystem_table_head_rule_tl { \hline }
-      \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \hline }
-      \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \hline }
-      \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \hline } ,
+      \tl_set:Nn \l__ghsystem_table_head_rule_tl { \hline }
+      \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \hline }
+      \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \hline }
+      \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \hline } ,
     table-rules / booktabs          .code:n     =
       \ghsystem_booktabs:n { table-rules }
-      \tl_set:Nn \l_ghsystem_table_head_rule_tl { \midrule }
-      \tl_set:Nn \l_ghsystem_table_top_head_rule_tl { \toprule }
-      \tl_set:Nn \l_ghsystem_table_foot_rule_tl { \midrule }
-      \tl_set:Nn \l_ghsystem_table_last_foot_rule_tl { \bottomrule } ,
+      \tl_set:Nn \l__ghsystem_table_head_rule_tl { \midrule }
+      \tl_set:Nn \l__ghsystem_table_top_head_rule_tl { \toprule }
+      \tl_set:Nn \l__ghsystem_table_foot_rule_tl { \midrule }
+      \tl_set:Nn \l__ghsystem_table_last_foot_rule_tl { \bottomrule } ,
     table-rules / none              .code:n     =
-      \tl_clear:N \l_ghsystem_table_head_rule_tl
-      \tl_clear:N \l_ghsystem_table_top_head_rule_tl
-      \tl_clear:N \l_ghsystem_table_foot_rule_tl
-      \tl_clear:N \l_ghsystem_table_last_foot_rule_tl ,
-    table-caption                   .tl_set:N   = \l_ghsystem_table_caption_tl ,
+      \tl_clear:N \l__ghsystem_table_head_rule_tl
+      \tl_clear:N \l__ghsystem_table_top_head_rule_tl
+      \tl_clear:N \l__ghsystem_table_foot_rule_tl
+      \tl_clear:N \l__ghsystem_table_last_foot_rule_tl ,
+    table-caption                   .tl_set:N   = \l__ghsystem_table_caption_tl ,
     table-caption-short             .tl_set:N   =
-      \l_ghsystem_table_caption_short_tl ,
-    table-label                     .tl_set:N   = \l_ghsystem_table_label_tl
+      \l__ghsystem_table_caption_short_tl ,
+    table-label                     .tl_set:N   = \l__ghsystem_table_label_tl
   }
 
 % --------------------------------------------------------------------------- %
@@ -302,7 +302,7 @@
 \NewDocumentCommand \ghs { somm }
   {
     \group_begin:
-      \IfBooleanF { #1 } { \bool_set_true:N \l_ghsystem_show_number_bool }
+      \IfBooleanF { #1 } { \bool_set_true:N \l__ghsystem_show_number_bool }
       \IfNoValueF { #2 } { \keys_set:nn { chemmacros / ghsystem } { #2 } }
       \ghsystem_read_args:nn { #3 } { #4 }
     \group_end:
@@ -310,12 +310,12 @@
 
 \cs_new:Nn \ghsystem_read_args:nn
   {
-    \ghsystem_get_type:nN { #1 } \l_ghsystem_tmpa_tl
-    \prop_get:cnNTF { l_ghsystem_ \l_ghsystem_tmpa_tl _prop } { #2 } \l_ghsystem_tmpb_tl
+    \ghsystem_get_type:nN { #1 } \l__ghsystem_tmpa_tl
+    \prop_get:cnNTF { l__ghsystem_ \l__ghsystem_tmpa_tl _prop } { #2 } \l__ghsystem_tmpb_tl
       {
         \ghsystem_is_combination:nn { #1 } { #2 }
-        \bool_if:NF \l_ghsystem_hide_statement_bool
-          { \tl_use:N \l_ghsystem_tmpb_tl  }
+        \bool_if:NF \l__ghsystem_hide_statement_bool
+          { \tl_use:N \l__ghsystem_tmpb_tl  }
       }
       { \chemmacros_msg:nnxx { ghsystem } { statements } { #1 } { #2 } }
   }
@@ -345,41 +345,41 @@
 
 \cs_new:Npn \ghsystem_is_combination_aux_i:w #1,#2+#3 \q_stop
   {
-    \bool_if:NT \l_ghsystem_show_number_bool
+    \bool_if:NT \l__ghsystem_show_number_bool
       {
         \tl_to_uppercase:n { #1 }
-        \tl_use:N \l_ghsystem_number_space_tl
+        \tl_use:N \l__ghsystem_number_space_tl
         #2 ~ + ~
         \tl_if_in:nnTF { #3 } { + }
           { \ghsystem_is_combination_aux_iii:w #1,#3 \q_stop }
           {
             \tl_to_uppercase:n { #1 }
-            \tl_use:N \l_ghsystem_number_space_tl
-            #3 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ }
+            \tl_use:N \l__ghsystem_number_space_tl
+            #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
           }
       }
   }
 
 \cs_new:Npn \ghsystem_is_combination_aux_ii:w #1,#2 \q_stop
   {
-    \bool_if:NT \l_ghsystem_show_number_bool
+    \bool_if:NT \l__ghsystem_show_number_bool
       {
         \tl_to_uppercase:n { #1 }
-        \tl_use:N \l_ghsystem_number_space_tl
-        #2 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ }
+        \tl_use:N \l__ghsystem_number_space_tl
+        #2 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
       }
   }
 
 \cs_new:Npn \ghsystem_is_combination_aux_iii:w #1,#2+#3 \q_stop
   {
-    \bool_if:NT \l_ghsystem_show_number_bool
+    \bool_if:NT \l__ghsystem_show_number_bool
       {
         \tl_to_uppercase:n { #1 }
-        \tl_use:N \l_ghsystem_number_space_tl
+        \tl_use:N \l__ghsystem_number_space_tl
         #2 ~ + ~
         \tl_to_uppercase:n { #1 }
-        \tl_use:N \l_ghsystem_number_space_tl
-        #3 \bool_if:NF \l_ghsystem_hide_statement_bool { : ~ }
+        \tl_use:N \l__ghsystem_number_space_tl
+        #3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
       }
   }
 
@@ -390,43 +390,43 @@
   {
     \group_begin:
       \IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } }
-      \int_zero:N \l_ghsystem_tmpa_int
-      \int_zero:N \l_ghsystem_tmpb_int
-      \prop_map_inline:Nn \l_ghsystem_p_prop { \int_incr:N \l_ghsystem_tmpa_int }
-      \dim_set_eq:NN \tabulinesep \l_ghsystem_table_line_sep_dim
+      \int_zero:N \l__ghsystem_tmpa_int
+      \int_zero:N \l__ghsystem_tmpb_int
+      \prop_map_inline:Nn \l__ghsystem_p_prop { \int_incr:N \l__ghsystem_tmpa_int }
+      \dim_set_eq:NN \tabulinesep \l__ghsystem_table_line_sep_dim
       \begin { longtabu } { X[3]X[7,L] }
-          \caption [ \l_ghsystem_table_caption_short_tl ]
+          \caption [ \l__ghsystem_table_caption_short_tl ]
             {
-              \l_ghsystem_table_caption_tl
-              \exp_args:No \label { \l_ghsystem_table_label_tl }
+              \l__ghsystem_table_caption_tl
+              \exp_args:No \label { \l__ghsystem_table_label_tl }
             } \\
-          \l_ghsystem_table_top_head_rule_tl
-          \textbf { \l_ghsystem_identifier_tl } &
-          \textbf { \l_ghsystem_table_text_tl } \\
-          \l_ghsystem_table_head_rule_tl
+          \l__ghsystem_table_top_head_rule_tl
+          \textbf { \l__ghsystem_identifier_tl } &
+          \textbf { \l__ghsystem_table_text_tl } \\
+          \l__ghsystem_table_head_rule_tl
         \endfirsthead
-          \l_ghsystem_table_top_head_rule_tl
-          \textbf { \l_ghsystem_identifier_tl } &
-          \textbf { \l_ghsystem_table_text_tl } \\
-          \l_ghsystem_table_head_rule_tl
+          \l__ghsystem_table_top_head_rule_tl
+          \textbf { \l__ghsystem_identifier_tl } &
+          \textbf { \l__ghsystem_table_text_tl } \\
+          \l__ghsystem_table_head_rule_tl
         \endhead
-          \l_ghsystem_table_last_foot_rule_tl
-          \multicolumn{2}{r} { \textit { \l_ghsystem_table_next_page_tl } }
+          \l__ghsystem_table_last_foot_rule_tl
+          \multicolumn{2}{r} { \textit { \l__ghsystem_table_next_page_tl } }
         \endfoot
-          \l_ghsystem_table_foot_rule_tl \multicolumn{2}{r} { }
+          \l__ghsystem_table_foot_rule_tl \multicolumn{2}{r} { }
         \endlastfoot
-        \prop_map_inline:Nn \l_ghsystem_h_prop
+        \prop_map_inline:Nn \l__ghsystem_h_prop
           { \ghsystem_read_number:nn { H } { ##1 } & ##2 \\ }
-        \prop_map_inline:Nn \l_ghsystem_euh_prop
+        \prop_map_inline:Nn \l__ghsystem_euh_prop
           { \ghsystem_read_number:nn { EUH } { ##1 } & ##2 \\ }
-        \int_zero:N \l_ghsystem_tmpa_int
-        \prop_map_inline:Nn \l_ghsystem_p_prop { \int_gincr:N \l_ghsystem_tmpa_int }
-        \int_zero:N \l_ghsystem_tmpb_int
-        \prop_map_inline:Nn \l_ghsystem_p_prop
+        \int_zero:N \l__ghsystem_tmpa_int
+        \prop_map_inline:Nn \l__ghsystem_p_prop { \int_gincr:N \l__ghsystem_tmpa_int }
+        \int_zero:N \l__ghsystem_tmpb_int
+        \prop_map_inline:Nn \l__ghsystem_p_prop
           {
-            \int_gincr:N \l_ghsystem_tmpb_int
+            \int_gincr:N \l__ghsystem_tmpb_int
             \ghsystem_read_number:nn { P } { ##1 } & ##2
-            \int_compare:nNnT { \l_ghsystem_tmpb_int } < { \l_ghsystem_tmpa_int } { \\ }
+            \int_compare:nNnT { \l__ghsystem_tmpb_int } < { \l__ghsystem_tmpa_int } { \\ }
           }
       \end { longtabu }
     \group_end:
@@ -436,12 +436,12 @@
   {
     \tl_if_in:nnTF { #2 } { + }
       { \ghsystem_read_number_aux_i:w #1 , #2 \q_stop }
-      { #1 \tl_use:N \l_ghsystem_number_space_tl #2 }
+      { #1 \tl_use:N \l__ghsystem_number_space_tl #2 }
   }
 
 \cs_new:Npn \ghsystem_read_number_aux_i:w #1,#2+#3\q_stop
   {
-     #1 \tl_use:N \l_ghsystem_number_space_tl #2 ~+~
+     #1 \tl_use:N \l__ghsystem_number_space_tl #2 ~+~
      \tl_if_in:nnTF { #3 } { + }
        { \ghsystem_read_number_aux_ii:w #1,#3 \q_stop }
        { #1#3 }
@@ -454,49 +454,49 @@
 %   \ghspic[<options>]{<name>}
 %
 % test for compilation engine/mode:
-\pdftex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_pdftex_bool }
-\xetex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_xetex_bool }
-\luatex_if_engine:T { \bool_set_true:N \l_ghsystem_engine_luatex_bool }
+\pdftex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_pdftex_bool }
+\xetex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_xetex_bool }
+\luatex_if_engine:T { \bool_set_true:N \l__ghsystem_engine_luatex_bool }
 
-\bool_new:N \l_ghsystem_picture_directory_bool
+\bool_new:N \l__ghsystem_picture_directory_bool
 
-\bool_if:NT \l_ghsystem_engine_pdftex_bool
+\bool_if:NT \l__ghsystem_engine_pdftex_bool
   {
     \ifpdf
-      \tl_set:Nn \l_ghsystem_picture_type_tl { pdf }
+      \tl_set:Nn \l__ghsystem_picture_type_tl { pdf }
     \else
-      \tl_set:Nn \l_ghsystem_picture_type_tl { eps }
+      \tl_set:Nn \l__ghsystem_picture_type_tl { eps }
     \fi
   }
-\bool_if:NT \l_ghsystem_engine_xetex_bool
-  { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } }
-\bool_if:NT \l_ghsystem_engine_luatex_bool
-  { \tl_set:Nn \l_ghsystem_picture_type_tl { pdf } }
+\bool_if:NT \l__ghsystem_engine_xetex_bool
+  { \tl_set:Nn \l__ghsystem_picture_type_tl { pdf } }
+\bool_if:NT \l__ghsystem_engine_luatex_bool
+  { \tl_set:Nn \l__ghsystem_picture_type_tl { pdf } }
 
 % the command:
 \NewDocumentCommand \ghspic { om }
   {
-    \file_if_exist:nTF { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
-      { \bool_set_true:N \l_ghsystem_picture_directory_bool }
-      { \bool_set_false:N \l_ghsystem_picture_directory_bool }
+    \file_if_exist:nTF { pictures / ghsystem_ #2 . \l__ghsystem_picture_type_tl }
+      { \bool_set_true:N \l__ghsystem_picture_directory_bool }
+      { \bool_set_false:N \l__ghsystem_picture_directory_bool }
     \group_begin:
       \IfNoValueF { #1 } { \keys_set:nn { chemmacros / ghsystem } { #1 } }
-      \bool_if:NTF \l_ghsystem_picture_directory_bool
+      \bool_if:NTF \l__ghsystem_picture_directory_bool
         {
           \ghsystem_includegraphics:xn
             {
-              scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
-              \l_ghsystem_picture_includegraphics_tl
+              scale = \fp_to_tl:N \l__ghsystem_picture_scale_fp
+              \l__ghsystem_picture_includegraphics_tl
             }
-            { pictures / ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+            { pictures / ghsystem_ #2 . \l__ghsystem_picture_type_tl }
         }
         {
           \ghsystem_includegraphics:xn
             {
-              scale = \fp_to_tl:N \l_ghsystem_picture_scale_fp
-              \l_ghsystem_picture_includegraphics_tl
+              scale = \fp_to_tl:N \l__ghsystem_picture_scale_fp
+              \l__ghsystem_picture_includegraphics_tl
             }
-            { ghsystem_ #2 . \l_ghsystem_picture_type_tl }
+            { ghsystem_ #2 . \l__ghsystem_picture_type_tl }
         }
     \group_end:
   }
diff --git a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def
index 58d8f861c98..521d0d7cc6c 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_english.def
@@ -13,7 +13,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -29,21 +29,21 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ExplSyntaxOn
 % ENGLISH DEFINITIONS
-\prop_clear:N \l_ghsystem_h_prop
-\prop_clear:N \l_ghsystem_euh_prop
-\prop_clear:N \l_ghsystem_p_prop
+\prop_clear:N \l__ghsystem_h_prop
+\prop_clear:N \l__ghsystem_euh_prop
+\prop_clear:N \l__ghsystem_p_prop
 
 % table head and foot:
-\tl_set:Nn \l_ghsystem_identifier_tl { Identifier }
-\tl_set:Nn \l_ghsystem_table_text_tl { Statement }
-\tl_set:Nn \l_ghsystem_table_next_page_tl { continues~on~next~page }
-\tl_set:Nn \l_ghsystem_table_caption_tl { All~H,~EUH,~and~P~Statements. }
+\tl_set:Nn \l__ghsystem_identifier_tl { Identifier }
+\tl_set:Nn \l__ghsystem_table_text_tl { Statement }
+\tl_set:Nn \l__ghsystem_table_next_page_tl { continues~on~next~page }
+\tl_set:Nn \l__ghsystem_table_caption_tl { All~H,~EUH,~and~P~Statements. }
 
 % fill-in functions:
 % <state route of exposure if it is conclusively proven that no other routes of exposure cause the hazard>.
 \cs_set:Npn \ghsystem_exposure:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit{\textless state~route~of~ex\-po\-sure~if~it~is~ con\-clu\-sive\-ly~pro\-ven~that~no~other~routes~of~ex\-po\-sure~cause~the~ha\-zard \textgreater}
       }
@@ -52,7 +52,7 @@
 %  <state specific effect if known> 
 \cs_set:Npn \ghsystem_effect:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit{\textless state~spe\-ci\-fic~effect~if~known \textgreater}
       }
@@ -61,7 +61,7 @@
 % <or state all organs affected, if known>
 \cs_set:Npn \ghsystem_organs:
   {
-    \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+    \bool_if:nT { \l__ghsystem_fill_in_bool && !\l__ghsystem_organs_bool }
       {
         \c_space_tl \textit{\textless or~state~all~or\-gans~affec\-ted,~if~known \textgreater}
       }
@@ -70,7 +70,7 @@
 % <name of sensitising substance>
 \cs_set:Npn \ghsystem_substance:
   {
-    \bool_if:NF \l_ghsystem_substance_bool
+    \bool_if:NF \l__ghsystem_substance_bool
       {
         \c_space_tl \textit{\textless name~of~sen\-si\-ti\-sing~sub\-stance \textgreater}
       }
@@ -79,265 +79,265 @@
 % HAZARD STATEMENTS (Annex 3)
 % 1. Hazard Statements
 % 1.1 Physical Hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 200 } { Un\-stable~ex\-plo\-sives. }
-\prop_put:Nnn \l_ghsystem_h_prop { 201 } { Ex\-plo\-sive;~mass~ex\-plo\-sion~ha\-zard. }
-\prop_put:Nnn \l_ghsystem_h_prop { 202 } { Ex\-plo\-sive,~se\-vere~pro\-jec\-tion~ha\-zard. }
-\prop_put:Nnn \l_ghsystem_h_prop { 203 } { Ex\-plo\-sive;~fire,~blast~or~pro\-jec\-tion~ha\-zard. }
-\prop_put:Nnn \l_ghsystem_h_prop { 204 } { Fire~or~pro\-jec\-tion~ha\-zard. }
-\prop_put:Nnn \l_ghsystem_h_prop { 205 } { May~mass~ex\-plode~in~fire. }
-\prop_put:Nnn \l_ghsystem_h_prop { 220 } { Ex\-treme\-ly~flammable~gas. }
-\prop_put:Nnn \l_ghsystem_h_prop { 221 } { Flammable~gas. }
-\prop_put:Nnn \l_ghsystem_h_prop { 222 } { Ex\-treme\-ly~flammable~aero\-sol. }
-\prop_put:Nnn \l_ghsystem_h_prop { 223 } { Flammable~aero\-sol. }
-\prop_put:Nnn \l_ghsystem_h_prop { 224 } { Ex\-treme\-ly~flammable~li\-quid~and~va\-pour. }
-\prop_put:Nnn \l_ghsystem_h_prop { 225 } { High\-ly~flammable~liquid~and~va\-pour. }
-\prop_put:Nnn \l_ghsystem_h_prop { 226 } { Flammable~li\-quid~and~va\-pour. }
-\prop_put:Nnn \l_ghsystem_h_prop { 228 } { Flammable~so\-lid. }
-\prop_put:Nnn \l_ghsystem_h_prop { 240 } { Heating~may~cause~an~ex\-plo\-sion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 241 } { Heating~may~cause~a~fire~or~ex\-plo\-sion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 242 } { Heating~may~cause~a~fire. }
-\prop_put:Nnn \l_ghsystem_h_prop { 250 } { Catches~fire~spon\-ta\-ne\-ous\-ly~if~ex\-po\-sed~to~air. }
-\prop_put:Nnn \l_ghsystem_h_prop { 251 } { Self-heating : ~may~catch~fire. }
-\prop_put:Nnn \l_ghsystem_h_prop { 252 } { Self-heating~in~large~quan\-ti\-ties;~may~catch~fire. }
-\prop_put:Nnn \l_ghsystem_h_prop { 260 } { In~con\-tact~with~wa\-ter~re\-leases~flammable~ga\-ses~which~may~ig\-nite~spon\-ta\-ne\-ous\-ly. }
-\prop_put:Nnn \l_ghsystem_h_prop { 261 } { In~con\-tact~with~wa\-ter~re\-leases~flammable~ga\-ses. }
-\prop_put:Nnn \l_ghsystem_h_prop { 270 } { May~cause~or~in\-ten\-si\-fy~fire;~oxi\-di\-ser. }
-\prop_put:Nnn \l_ghsystem_h_prop { 271 } { May~cause~fire~or~ex\-plo\-sion;~strong~oxi\-di\-ser. }
-\prop_put:Nnn \l_ghsystem_h_prop { 272 } { May~in\-ten\-si\-fy~fire;~oxi\-di\-ser. }
-\prop_put:Nnn \l_ghsystem_h_prop { 280 } { Con\-tains~gas~un\-der~pressure;~may~ex\-plode~if~heated. }
-\prop_put:Nnn \l_ghsystem_h_prop { 281 } { Con\-tains~re\-fri\-ge\-ra\-ted~gas;~may~cause~cryo\-ge\-nic~burns~or~in\-ju\-ry. }
-\prop_put:Nnn \l_ghsystem_h_prop { 290 } { May~be~corro\-sive~to~me\-tals. }
+\prop_put:Nnn \l__ghsystem_h_prop { 200 } { Un\-stable~ex\-plo\-sives. }
+\prop_put:Nnn \l__ghsystem_h_prop { 201 } { Ex\-plo\-sive;~mass~ex\-plo\-sion~ha\-zard. }
+\prop_put:Nnn \l__ghsystem_h_prop { 202 } { Ex\-plo\-sive,~se\-vere~pro\-jec\-tion~ha\-zard. }
+\prop_put:Nnn \l__ghsystem_h_prop { 203 } { Ex\-plo\-sive;~fire,~blast~or~pro\-jec\-tion~ha\-zard. }
+\prop_put:Nnn \l__ghsystem_h_prop { 204 } { Fire~or~pro\-jec\-tion~ha\-zard. }
+\prop_put:Nnn \l__ghsystem_h_prop { 205 } { May~mass~ex\-plode~in~fire. }
+\prop_put:Nnn \l__ghsystem_h_prop { 220 } { Ex\-treme\-ly~flammable~gas. }
+\prop_put:Nnn \l__ghsystem_h_prop { 221 } { Flammable~gas. }
+\prop_put:Nnn \l__ghsystem_h_prop { 222 } { Ex\-treme\-ly~flammable~aero\-sol. }
+\prop_put:Nnn \l__ghsystem_h_prop { 223 } { Flammable~aero\-sol. }
+\prop_put:Nnn \l__ghsystem_h_prop { 224 } { Ex\-treme\-ly~flammable~li\-quid~and~va\-pour. }
+\prop_put:Nnn \l__ghsystem_h_prop { 225 } { High\-ly~flammable~liquid~and~va\-pour. }
+\prop_put:Nnn \l__ghsystem_h_prop { 226 } { Flammable~li\-quid~and~va\-pour. }
+\prop_put:Nnn \l__ghsystem_h_prop { 228 } { Flammable~so\-lid. }
+\prop_put:Nnn \l__ghsystem_h_prop { 240 } { Heating~may~cause~an~ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 241 } { Heating~may~cause~a~fire~or~ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 242 } { Heating~may~cause~a~fire. }
+\prop_put:Nnn \l__ghsystem_h_prop { 250 } { Catches~fire~spon\-ta\-ne\-ous\-ly~if~ex\-po\-sed~to~air. }
+\prop_put:Nnn \l__ghsystem_h_prop { 251 } { Self-heating : ~may~catch~fire. }
+\prop_put:Nnn \l__ghsystem_h_prop { 252 } { Self-heating~in~large~quan\-ti\-ties;~may~catch~fire. }
+\prop_put:Nnn \l__ghsystem_h_prop { 260 } { In~con\-tact~with~wa\-ter~re\-leases~flammable~ga\-ses~which~may~ig\-nite~spon\-ta\-ne\-ous\-ly. }
+\prop_put:Nnn \l__ghsystem_h_prop { 261 } { In~con\-tact~with~wa\-ter~re\-leases~flammable~ga\-ses. }
+\prop_put:Nnn \l__ghsystem_h_prop { 270 } { May~cause~or~in\-ten\-si\-fy~fire;~oxi\-di\-ser. }
+\prop_put:Nnn \l__ghsystem_h_prop { 271 } { May~cause~fire~or~ex\-plo\-sion;~strong~oxi\-di\-ser. }
+\prop_put:Nnn \l__ghsystem_h_prop { 272 } { May~in\-ten\-si\-fy~fire;~oxi\-di\-ser. }
+\prop_put:Nnn \l__ghsystem_h_prop { 280 } { Con\-tains~gas~un\-der~pressure;~may~ex\-plode~if~heated. }
+\prop_put:Nnn \l__ghsystem_h_prop { 281 } { Con\-tains~re\-fri\-ge\-ra\-ted~gas;~may~cause~cryo\-ge\-nic~burns~or~in\-ju\-ry. }
+\prop_put:Nnn \l__ghsystem_h_prop { 290 } { May~be~corro\-sive~to~me\-tals. }
 
 % 1.2 Health Hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 300 } { Fa\-tal~if~swallowed. }
-\prop_put:Nnn \l_ghsystem_h_prop { 301 } { To\-xic~if~swallowed. }
-\prop_put:Nnn \l_ghsystem_h_prop { 302 } { Harm\-ful~if~swallowed. }
-\prop_put:Nnn \l_ghsystem_h_prop { 304 } { May~be~fa\-tal~if~swallowed~and~en\-ters~air\-ways. }
-\prop_put:Nnn \l_ghsystem_h_prop { 310 } { Fa\-tal~in~con\-tact~with~skin. }
-\prop_put:Nnn \l_ghsystem_h_prop { 311 } { To\-xic~in~con\-tact~with~skin. }
-\prop_put:Nnn \l_ghsystem_h_prop { 312 } { Harm\-ful~in~con\-tact~with~skin. }
-\prop_put:Nnn \l_ghsystem_h_prop { 314 } { Cau\-ses~se\-vere~skin~burns~and~eye~da\-mage. }
-\prop_put:Nnn \l_ghsystem_h_prop { 315 } { Cau\-ses~skin~ir\-ri\-ta\-tion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 317 } { May~cause~an~aller\-gic~skin~reac\-tion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 318 } { Causes~se\-rious~eye~da\-mage. }
-\prop_put:Nnn \l_ghsystem_h_prop { 319 } { Causes~se\-rious~eye~irri\-ta\-tion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 330 } { Fa\-tal~if~in\-haled. }
-\prop_put:Nnn \l_ghsystem_h_prop { 331 } { To\-xic~if~in\-haled. }
-\prop_put:Nnn \l_ghsystem_h_prop { 332 } { Harm\-ful~if~in\-haled. }
-\prop_put:Nnn \l_ghsystem_h_prop { 334 } { May~cause~aller\-gy~or~asth\-ma~symp\-toms~or\-breathing~diffi\-cul\-ties~if~in\-haled. }
-\prop_put:Nnn \l_ghsystem_h_prop { 335 } { May~cause~res\-pi\-ra\-to\-ry~irri\-ta\-tion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 336 } { May~cause~drowsi\-ness~or~dizzi\-ness. }
-\prop_put:Nnn \l_ghsystem_h_prop { 340 } { May~cause~ge\-ne\-tic~de\-fects. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 341 } { Sus\-pec\-ted~of~causing~ge\-ne\-tic~de\-fects. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 350 } { May~cause~can\-cer. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 351 } { Sus\-pec\-ted~of~causing~cancer. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 360 } { May~da\-mage~fer\-ti\-li\-ty~or~the~un\-born~child. \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 361 } { Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty~or~the~un\-born~child. \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 362 } { May~cause~harm~to~breast-fed~child\-ren. }
-\prop_put:Nnn \l_ghsystem_h_prop { 370 } { Causes~da\-mage \bool_if:NF \l_ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs: . \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 371 } { May~cause~da\-mage \bool_if:NF \l_ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs: . \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 372 } { Causes~da\-mage \bool_if:NF \l_ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs:\ through~pro\-longed~or~re\-pea\-ted~ex\-po\-sure. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 373 } { May~cause~da\-mage \bool_if:NF \l_ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs:\ through~pro\-longed~or~re\-pea\-ted~ex\-po\-sure. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 300 } { Fa\-tal~if~swallowed. }
+\prop_put:Nnn \l__ghsystem_h_prop { 301 } { To\-xic~if~swallowed. }
+\prop_put:Nnn \l__ghsystem_h_prop { 302 } { Harm\-ful~if~swallowed. }
+\prop_put:Nnn \l__ghsystem_h_prop { 304 } { May~be~fa\-tal~if~swallowed~and~en\-ters~air\-ways. }
+\prop_put:Nnn \l__ghsystem_h_prop { 310 } { Fa\-tal~in~con\-tact~with~skin. }
+\prop_put:Nnn \l__ghsystem_h_prop { 311 } { To\-xic~in~con\-tact~with~skin. }
+\prop_put:Nnn \l__ghsystem_h_prop { 312 } { Harm\-ful~in~con\-tact~with~skin. }
+\prop_put:Nnn \l__ghsystem_h_prop { 314 } { Cau\-ses~se\-vere~skin~burns~and~eye~da\-mage. }
+\prop_put:Nnn \l__ghsystem_h_prop { 315 } { Cau\-ses~skin~ir\-ri\-ta\-tion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 317 } { May~cause~an~aller\-gic~skin~reac\-tion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 318 } { Causes~se\-rious~eye~da\-mage. }
+\prop_put:Nnn \l__ghsystem_h_prop { 319 } { Causes~se\-rious~eye~irri\-ta\-tion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 330 } { Fa\-tal~if~in\-haled. }
+\prop_put:Nnn \l__ghsystem_h_prop { 331 } { To\-xic~if~in\-haled. }
+\prop_put:Nnn \l__ghsystem_h_prop { 332 } { Harm\-ful~if~in\-haled. }
+\prop_put:Nnn \l__ghsystem_h_prop { 334 } { May~cause~aller\-gy~or~asth\-ma~symp\-toms~or\-breathing~diffi\-cul\-ties~if~in\-haled. }
+\prop_put:Nnn \l__ghsystem_h_prop { 335 } { May~cause~res\-pi\-ra\-to\-ry~irri\-ta\-tion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 336 } { May~cause~drowsi\-ness~or~dizzi\-ness. }
+\prop_put:Nnn \l__ghsystem_h_prop { 340 } { May~cause~ge\-ne\-tic~de\-fects. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 341 } { Sus\-pec\-ted~of~causing~ge\-ne\-tic~de\-fects. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 350 } { May~cause~can\-cer. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 351 } { Sus\-pec\-ted~of~causing~cancer. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 360 } { May~da\-mage~fer\-ti\-li\-ty~or~the~un\-born~child. \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 361 } { Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty~or~the~un\-born~child. \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 362 } { May~cause~harm~to~breast-fed~child\-ren. }
+\prop_put:Nnn \l__ghsystem_h_prop { 370 } { Causes~da\-mage \bool_if:NF \l__ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs: . \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 371 } { May~cause~da\-mage \bool_if:NF \l__ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs: . \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 372 } { Causes~da\-mage \bool_if:NF \l__ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs:\ through~pro\-longed~or~re\-pea\-ted~ex\-po\-sure. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 373 } { May~cause~da\-mage \bool_if:NF \l__ghsystem_organs_bool { ~to~or\-gans } \ghsystem_organs:\ through~pro\-longed~or~re\-pea\-ted~ex\-po\-sure. \ghsystem_exposure: }
 
 % 1.3 Environmental hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 400 } { Ve\-ry~to\-xic~to~aqua\-tic~life. }
-\prop_put:Nnn \l_ghsystem_h_prop { 410 } { Ve\-ry~to\-xic~to~aqua\-tic~life~with~long~las\-ting~effects. }
-\prop_put:Nnn \l_ghsystem_h_prop { 411 } { To\-xic~to~aqua\-tic~life~with~long~las\-ting~effects. }
-\prop_put:Nnn \l_ghsystem_h_prop { 412 } { Harm\-ful~to~aqua\-tic~life~ with~long~las\-ting~effects. }
-\prop_put:Nnn \l_ghsystem_h_prop { 413 } { May~cause~long~las\-ting~harm\-ful~effects~to~aqua\-tic~life. }
+\prop_put:Nnn \l__ghsystem_h_prop { 400 } { Ve\-ry~to\-xic~to~aqua\-tic~life. }
+\prop_put:Nnn \l__ghsystem_h_prop { 410 } { Ve\-ry~to\-xic~to~aqua\-tic~life~with~long~las\-ting~effects. }
+\prop_put:Nnn \l__ghsystem_h_prop { 411 } { To\-xic~to~aqua\-tic~life~with~long~las\-ting~effects. }
+\prop_put:Nnn \l__ghsystem_h_prop { 412 } { Harm\-ful~to~aqua\-tic~life~ with~long~las\-ting~effects. }
+\prop_put:Nnn \l__ghsystem_h_prop { 413 } { May~cause~long~las\-ting~harm\-ful~effects~to~aqua\-tic~life. }
 
 % 2 Supplemental Hazard Informations
 % 2.1 Physical Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 001 } { Ex\-plo\-sive~when~dry. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 006 } { Ex\-plo\-sive~with~or~with\-out~con\-tact~with~air. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 014 } { Reacts~vio\-lent\-ly~with~wa\-ter. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { In~use~may~form~flammable/ex\-plo\-sive~va\-pour-air~mix\-ture. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 019 } { May~form~ex\-plo\-sive~per\-oxides. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 044 } { Risk~of~ex\-plo\-sion~if~heated~un\-der~con\-fine\-ment. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 001 } { Ex\-plo\-sive~when~dry. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 006 } { Ex\-plo\-sive~with~or~with\-out~con\-tact~with~air. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 014 } { Reacts~vio\-lent\-ly~with~wa\-ter. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 018 } { In~use~may~form~flammable/ex\-plo\-sive~va\-pour-air~mix\-ture. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 019 } { May~form~ex\-plo\-sive~per\-oxides. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 044 } { Risk~of~ex\-plo\-sion~if~heated~un\-der~con\-fine\-ment. }
 
 % 2.2 Health Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 029 } { Con\-tact~with~wa\-ter~li\-be\-rates~to\-xic~gas. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 031 } { Con\-tact~with~acids~li\-be\-rates~to\-xic~gas. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 032 } { Con\-tact~with~acids~li\-be\-rates~ve\-ry~to\-xic~gas. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 066 } { Re\-pea\-ted~ex\-po\-sure~may~cause~skin~dry\-ness~or~cracking. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 070 } { Toxic~by~eye~con\-tact. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 071 } { Corro\-sive~to~the~respi\-ra\-to\-ry~tract. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 029 } { Con\-tact~with~wa\-ter~li\-be\-rates~to\-xic~gas. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 031 } { Con\-tact~with~acids~li\-be\-rates~to\-xic~gas. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 032 } { Con\-tact~with~acids~li\-be\-rates~ve\-ry~to\-xic~gas. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 066 } { Re\-pea\-ted~ex\-po\-sure~may~cause~skin~dry\-ness~or~cracking. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 070 } { Toxic~by~eye~con\-tact. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 071 } { Corro\-sive~to~the~respi\-ra\-to\-ry~tract. }
 
 % 2.3 Environmental Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 059 } { Ha\-zar\-dous~to~the~ozone~layer. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 059 } { Ha\-zar\-dous~to~the~ozone~layer. }
 
 % 2.4 Supplemental Label Elements/Information On Certain Substances And Mixtures
-\prop_put:Nnn \l_ghsystem_euh_prop { 201 } { Con\-tains~lead.~Should~not~be~used~on~sur\-faces~liable~to~be~chewed~or~sucked~by~child\-ren. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 201A } { Warning!~con\-tains~lead. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 202 } { \iupac { Cyano\|acrylate } . ~ Dan\-ger.~Bonds~skin~and~eyes~in~se\-conds.~Keep~out~of~the~reach~of~child\-ren. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 203 } { Con\-tains ~ \ox[pos=side]{ 6 , chromium } . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 204 } { Con\-tains ~ \iupac { iso\|cyanates } . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 205 } { Con\-tains~epoxy~consti\-tuents.~May~pro\-duce~an~aller\-gic~reac\-tion. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 206 } { War\-ning!~Do~not~use~to\-gether~with~other~pro\-ducts.~May~re\-lease~dan\-ge\-rous~gases~(chlorine). }
-\prop_put:Nnn \l_ghsystem_euh_prop { 207 } { War\-ning!~Con\-tains ~ \iupac { cad\|mium } . ~ Dan\-ge\-rous~fumes~are~formed~du\-ring~use.~See~in\-for\-ma\-tion~supplied~by~the~ma\-nu\-fac\-turer.~Comply~with~the~safety~in\-struc\-tions. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { Con\-tains \ghsystem_substance: . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209 } { Can~be\-come~high\-ly~flammable~in~use. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209A } { Can~be\-come~flammable~in~use. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 210 } { Safe\-ty~da\-ta~sheet~available~on~re\-quest. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 401 } { To~avoid~risks~to~hu\-man~health~and~the~en\-vi\-ron\-ment,~comply~with~the~in\-struc\-tions~for~use. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201 } { Con\-tains~lead.~Should~not~be~used~on~sur\-faces~liable~to~be~chewed~or~sucked~by~child\-ren. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201A } { Warning!~con\-tains~lead. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 202 } { \iupac { Cyano\|acrylate } . ~ Dan\-ger.~Bonds~skin~and~eyes~in~se\-conds.~Keep~out~of~the~reach~of~child\-ren. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 203 } { Con\-tains ~ \ox[pos=side]{ 6 , chromium } . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 204 } { Con\-tains ~ \iupac { iso\|cyanates } . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 205 } { Con\-tains~epoxy~consti\-tuents.~May~pro\-duce~an~aller\-gic~reac\-tion. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 206 } { War\-ning!~Do~not~use~to\-gether~with~other~pro\-ducts.~May~re\-lease~dan\-ge\-rous~gases~(chlorine). }
+\prop_put:Nnn \l__ghsystem_euh_prop { 207 } { War\-ning!~Con\-tains ~ \iupac { cad\|mium } . ~ Dan\-ge\-rous~fumes~are~formed~du\-ring~use.~See~in\-for\-ma\-tion~supplied~by~the~ma\-nu\-fac\-turer.~Comply~with~the~safety~in\-struc\-tions. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 208 } { Con\-tains \ghsystem_substance: . ~ May~pro\-duce~an~aller\-gic~reac\-tion. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209 } { Can~be\-come~high\-ly~flammable~in~use. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209A } { Can~be\-come~flammable~in~use. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 210 } { Safe\-ty~da\-ta~sheet~available~on~re\-quest. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 401 } { To~avoid~risks~to~hu\-man~health~and~the~en\-vi\-ron\-ment,~comply~with~the~in\-struc\-tions~for~use. }
 
 % PRECAUTIONARY STATEMENTS (Annex 4 page 19ff)
 % 3 Precautionary Statements
 % 3.1 General
-\prop_put:Nnn \l_ghsystem_p_prop { 101 } { If~me\-di\-cal~ad\-vice~is~needed,~have~pro\-duct~con\-tainer~or~la\-bel~at~hand. }
-\prop_put:Nnn \l_ghsystem_p_prop { 102 } { Keep~out~of~reach~of~child\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 103 } { Read~label~be\-fore~use. }
+\prop_put:Nnn \l__ghsystem_p_prop { 101 } { If~me\-di\-cal~ad\-vice~is~needed,~have~pro\-duct~con\-tainer~or~la\-bel~at~hand. }
+\prop_put:Nnn \l__ghsystem_p_prop { 102 } { Keep~out~of~reach~of~child\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 103 } { Read~label~be\-fore~use. }
 
 % 3.2 Precautionary Statements — Prevention
-\prop_put:Nnn \l_ghsystem_p_prop { 201 } { Ob\-tain~spe\-cial~in\-struc\-tions~be\-fore~use. }
-\prop_put:Nnn \l_ghsystem_p_prop { 202 } { Do~not~handle~un\-til~all~safe\-ty~pre\-cau\-tions~have~been~read~and~un\-der\-stood. }
-\prop_put:Nnn \l_ghsystem_p_prop { 210 } { Keep~away~from~heat/sparks/open~flames/hot~sur\-faces.~\textemdash\ No~smo\-king. }
-\prop_put:Nnn \l_ghsystem_p_prop { 211 } { Do~not~spray~on~an~open~flame~or~other~ig\-ni\-tion~source. }
-\prop_put:Nnn \l_ghsystem_p_prop { 220 } { Keep/Store~away~from~clothing/ \l_ghsystem_dots_tl /com\-bus\-tible~ma\-te\-rials. }
-\prop_put:Nnn \l_ghsystem_p_prop { 221 } { Take~any~pre\-cau\-tion~to~avoid~mi\-xing~with~com\-bus\-tibles ~ \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 222 } { Do~not~allow~con\-tact~with~air. }
-\prop_put:Nnn \l_ghsystem_p_prop { 223 } { Keep~away~from~any~possible~con\-tact~with~wa\-ter,~be\-cause~of~vio\-lent~reac\-tion~and~possible~flash~fire. }
-\prop_put:Nnn \l_ghsystem_p_prop { 230 } { Keep~wetted~with ~ \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 } { Handle~un\-der~inert~gas. }
-\prop_put:Nnn \l_ghsystem_p_prop { 232 } { Pro\-tect~from~mois\-ture. }
-\prop_put:Nnn \l_ghsystem_p_prop { 233 } { Keep~con\-tainer~tight\-ly~closed. }
-\prop_put:Nnn \l_ghsystem_p_prop { 234 } { Keep~only~in~ori\-gi\-nal~con\-tai\-ner. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 } { Keep~cool. }
-\prop_put:Nnn \l_ghsystem_p_prop { 240 } { Ground/bond~con\-tai\-ner~and~re\-cei\-ving~equip\-ment. }
-\prop_put:Nnn \l_ghsystem_p_prop { 241 } { Use~ex\-plo\-sion-proof~elec\-tri\-cal/ven\-ti\-la\-ting/ligh\-ting / \l_ghsystem_dots_tl\ e\-quip\-ment. }
-\prop_put:Nnn \l_ghsystem_p_prop { 242 } { Use~on\-ly~non-spar\-king~tools. }
-\prop_put:Nnn \l_ghsystem_p_prop { 243 } { Take~pre\-cau\-tionary~mea\-sures~against~sta\-tic~dis\-charge. }
-\prop_put:Nnn \l_ghsystem_p_prop { 244 } { Keep~re\-duc\-tion~valves~free~from~grease~and~oil. }
-\prop_put:Nnn \l_ghsystem_p_prop { 250 } { Do~not~sub\-ject~to~grin\-ding/shock / \l_ghsystem_dots_tl / fric\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 251 } { Pressu\-rized~con\-tai\-ner : ~ Do~not~pierce~or~burn,~even~after~use. }
-\prop_put:Nnn \l_ghsystem_p_prop { 260 } { Do~not~breathe~dust/fume/gas/mist/va\-pours/spray. }
-\prop_put:Nnn \l_ghsystem_p_prop { 261 } { Avoid~brea\-thing~dust/fume/gas/mist/va\-pours/spray. }
-\prop_put:Nnn \l_ghsystem_p_prop { 262 } { Do~not~get~in~eyes,~on~skin,~or~on~clothing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 263 } { Avoid~con\-tact~du\-ring~preg\-nan\-cy/while~nur\-sing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 264 } { Wash ~ \l_ghsystem_dots_tl\  tho\-rough\-ly~after~hand\-ling. }
-\prop_put:Nnn \l_ghsystem_p_prop { 270 } { Do~not~eat,~drink~or~smoke~when~using~this~pro\-duct. }
-\prop_put:Nnn \l_ghsystem_p_prop { 271 } { Use~on\-ly~out\-doors~or~in~a~well-ven\-ti\-la\-ted~area. }
-\prop_put:Nnn \l_ghsystem_p_prop { 272 } { Con\-ta\-mi\-na\-ted~work~clo\-thing~should~not~be~allowed~out~of~the~work\-place. }
-\prop_put:Nnn \l_ghsystem_p_prop { 273 } { Avoid~re\-lease~to~the~en\-vi\-ron\-ment. }
-\prop_put:Nnn \l_ghsystem_p_prop { 280 } { Wear~pro\-tec\-tive~gloves/pro\-tec\-tive~clo\-thing/eye~pro\-tec\-tion/face~pro\-tec\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 281 } { Use~per\-so\-nal~pro\-tec\-tive~equip\-ment~as~re\-quired. }
-\prop_put:Nnn \l_ghsystem_p_prop { 282 } { Wear~cold~in\-su\-la\-ting~gloves/face~shield/eye~pro\-tec\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 283 } { Wear~fire/flame~re\-sis\-tant/re\-tar\-dant~clo\-thing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 284 } { Wear~res\-pi\-ra\-to\-ry~pro\-tec\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 285 } { In~case~of~in\-ade\-quate~ven\-ti\-la\-tion~wear~res\-pi\-ra\-to\-ry~pro\-tec\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 + 231 } { Handle~un\-der~inert~gas.~Pro\-tect~from~mois\-ture. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 + 410 } { Keep~cool.~Pro\-tect~from~sun\-light. }
+\prop_put:Nnn \l__ghsystem_p_prop { 201 } { Ob\-tain~spe\-cial~in\-struc\-tions~be\-fore~use. }
+\prop_put:Nnn \l__ghsystem_p_prop { 202 } { Do~not~handle~un\-til~all~safe\-ty~pre\-cau\-tions~have~been~read~and~un\-der\-stood. }
+\prop_put:Nnn \l__ghsystem_p_prop { 210 } { Keep~away~from~heat/sparks/open~flames/hot~sur\-faces.~\textemdash\ No~smo\-king. }
+\prop_put:Nnn \l__ghsystem_p_prop { 211 } { Do~not~spray~on~an~open~flame~or~other~ig\-ni\-tion~source. }
+\prop_put:Nnn \l__ghsystem_p_prop { 220 } { Keep/Store~away~from~clothing/ \l__ghsystem_dots_tl /com\-bus\-tible~ma\-te\-rials. }
+\prop_put:Nnn \l__ghsystem_p_prop { 221 } { Take~any~pre\-cau\-tion~to~avoid~mi\-xing~with~com\-bus\-tibles ~ \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 222 } { Do~not~allow~con\-tact~with~air. }
+\prop_put:Nnn \l__ghsystem_p_prop { 223 } { Keep~away~from~any~possible~con\-tact~with~wa\-ter,~be\-cause~of~vio\-lent~reac\-tion~and~possible~flash~fire. }
+\prop_put:Nnn \l__ghsystem_p_prop { 230 } { Keep~wetted~with ~ \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 } { Handle~un\-der~inert~gas. }
+\prop_put:Nnn \l__ghsystem_p_prop { 232 } { Pro\-tect~from~mois\-ture. }
+\prop_put:Nnn \l__ghsystem_p_prop { 233 } { Keep~con\-tainer~tight\-ly~closed. }
+\prop_put:Nnn \l__ghsystem_p_prop { 234 } { Keep~only~in~ori\-gi\-nal~con\-tai\-ner. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 } { Keep~cool. }
+\prop_put:Nnn \l__ghsystem_p_prop { 240 } { Ground/bond~con\-tai\-ner~and~re\-cei\-ving~equip\-ment. }
+\prop_put:Nnn \l__ghsystem_p_prop { 241 } { Use~ex\-plo\-sion-proof~elec\-tri\-cal/ven\-ti\-la\-ting/ligh\-ting / \l__ghsystem_dots_tl\ e\-quip\-ment. }
+\prop_put:Nnn \l__ghsystem_p_prop { 242 } { Use~on\-ly~non-spar\-king~tools. }
+\prop_put:Nnn \l__ghsystem_p_prop { 243 } { Take~pre\-cau\-tionary~mea\-sures~against~sta\-tic~dis\-charge. }
+\prop_put:Nnn \l__ghsystem_p_prop { 244 } { Keep~re\-duc\-tion~valves~free~from~grease~and~oil. }
+\prop_put:Nnn \l__ghsystem_p_prop { 250 } { Do~not~sub\-ject~to~grin\-ding/shock / \l__ghsystem_dots_tl / fric\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 251 } { Pressu\-rized~con\-tai\-ner : ~ Do~not~pierce~or~burn,~even~after~use. }
+\prop_put:Nnn \l__ghsystem_p_prop { 260 } { Do~not~breathe~dust/fume/gas/mist/va\-pours/spray. }
+\prop_put:Nnn \l__ghsystem_p_prop { 261 } { Avoid~brea\-thing~dust/fume/gas/mist/va\-pours/spray. }
+\prop_put:Nnn \l__ghsystem_p_prop { 262 } { Do~not~get~in~eyes,~on~skin,~or~on~clothing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 263 } { Avoid~con\-tact~du\-ring~preg\-nan\-cy/while~nur\-sing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 264 } { Wash ~ \l__ghsystem_dots_tl\  tho\-rough\-ly~after~hand\-ling. }
+\prop_put:Nnn \l__ghsystem_p_prop { 270 } { Do~not~eat,~drink~or~smoke~when~using~this~pro\-duct. }
+\prop_put:Nnn \l__ghsystem_p_prop { 271 } { Use~on\-ly~out\-doors~or~in~a~well-ven\-ti\-la\-ted~area. }
+\prop_put:Nnn \l__ghsystem_p_prop { 272 } { Con\-ta\-mi\-na\-ted~work~clo\-thing~should~not~be~allowed~out~of~the~work\-place. }
+\prop_put:Nnn \l__ghsystem_p_prop { 273 } { Avoid~re\-lease~to~the~en\-vi\-ron\-ment. }
+\prop_put:Nnn \l__ghsystem_p_prop { 280 } { Wear~pro\-tec\-tive~gloves/pro\-tec\-tive~clo\-thing/eye~pro\-tec\-tion/face~pro\-tec\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 281 } { Use~per\-so\-nal~pro\-tec\-tive~equip\-ment~as~re\-quired. }
+\prop_put:Nnn \l__ghsystem_p_prop { 282 } { Wear~cold~in\-su\-la\-ting~gloves/face~shield/eye~pro\-tec\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 283 } { Wear~fire/flame~re\-sis\-tant/re\-tar\-dant~clo\-thing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 284 } { Wear~res\-pi\-ra\-to\-ry~pro\-tec\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 285 } { In~case~of~in\-ade\-quate~ven\-ti\-la\-tion~wear~res\-pi\-ra\-to\-ry~pro\-tec\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 + 231 } { Handle~un\-der~inert~gas.~Pro\-tect~from~mois\-ture. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 + 410 } { Keep~cool.~Pro\-tect~from~sun\-light. }
 
 % 3.3 Precautionary Statements — Response
-\prop_put:Nnn \l_ghsystem_p_prop { 301 } { IF~SWALLOWED : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 } { IF~ON~SKIN : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 } { IF~ON~SKIN~(or~hair) : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 } { IF~IN\-HALED : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 } { IF~IN~EYES : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 } { IF~ON~CLO\-THING : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 } { IF~ex\-po\-sed : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 } { IF~ex\-po\-sed~or~con\-cerned : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 } { IF~ex\-po\-sed~or~if~you~feel~un\-well : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 310 } { Imme\-diate\-ly~call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 311 } { Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 312 } { Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian~if~you~feel~un\-well. }
-\prop_put:Nnn \l_ghsystem_p_prop { 313 } { Get~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 314 } { Get~me\-di\-cal~ad\-vice/atten\-tion~if~you~feel~un\-well. }
-\prop_put:Nnn \l_ghsystem_p_prop { 315 } { Get~imme\-diate~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 320 } { Spe~ci\-fic~treat\-ment~is~ur\-gent~(see ~ \l_ghsystem_dots_tl\ on~this~la\-bel). }
-\prop_put:Nnn \l_ghsystem_p_prop { 321 } { Spe~ci\-fic~treat\-ment~(see ~ \l_ghsystem_dots_tl\ on~this~la\-bel). }
-\prop_put:Nnn \l_ghsystem_p_prop { 322 } { Spe~ci\-fic~mea\-sures~(see ~ \l_ghsystem_dots_tl\ on~this~la\-bel). }
-\prop_put:Nnn \l_ghsystem_p_prop { 330 } { Rinse~mouth. }
-\prop_put:Nnn \l_ghsystem_p_prop { 331 } { Do~NOT~in\-duce~vo\-mitting. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 } { If~skin~irri\-tation~occurs : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 } { If~skin~irri\-tation~or~rash~occurs : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 334 } { Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-da\-ges. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 } { Brush~off~loose~par\-ticles~from~skin. }
-\prop_put:Nnn \l_ghsystem_p_prop { 336 } { Thaw~frosted~parts~with~luke\-warm~wa\-ter.~Do~not~rub~affec\-ted~area. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 } { If~eye~irri\-ta\-tion~per\-sists : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 338 } { Re\-move~con\-tact~lenses,~if~present~and~easy~to~do.~Con\-tinue~rin\-sing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 340 } { Re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~breathing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 341 } { If~brea\-thing~is~diffi\-cult,~re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 } { If~ex\-pe\-rien\-cing~res\-pi\-ra\-to\-ry~symp\-toms : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 350 } { Gently~wash~with~plen\-ty~of~soap~and~wa\-ter. }
-\prop_put:Nnn \l_ghsystem_p_prop { 351 } { Rinse~cau\-tious\-ly~with~water~for~se\-ve\-ral~mi\-nutes. }
-\prop_put:Nnn \l_ghsystem_p_prop { 352 } { Wash~with~plen\-ty~of~soap~and~wa\-ter. }
-\prop_put:Nnn \l_ghsystem_p_prop { 353 } { Rinse~skin~with~wa\-ter/shower. }
-\prop_put:Nnn \l_ghsystem_p_prop { 360 } { Rinse~imme\-diate\-ly~con\-ta\-mi\-na\-ted~clo\-thing~and~skin~with~plen\-ty~of~wa\-ter~be\-fore~re\-moving~clothes. }
-\prop_put:Nnn \l_ghsystem_p_prop { 361 } { Re\-move/Take~off~imme\-diate\-ly~all~con\-ta\-mi\-na\-ted~clo\-thing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 362 } { Take~off~con\-ta\-mi\-na\-ted~clo\-thing~and~wash~be\-fore~r\-euse. }
-\prop_put:Nnn \l_ghsystem_p_prop { 363 } { Wash~con\-ta\-mi\-na\-ted~clo\-thing~be\-fore~re\-use. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 } { In~case~of~fire : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 } { In~case~of~ma\-jor~fire~and~large~quan\-ti\-ties : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 372 } { Ex\-plo\-sion~risk~in~case~of~fire. }
-\prop_put:Nnn \l_ghsystem_p_prop { 373 } { DO~NOT~fight~fire~when~fire~reaches~ex\-plo\-sives. }
-\prop_put:Nnn \l_ghsystem_p_prop { 374 } { Fight~fire~with~nor\-mal~pre\-cau\-tions~from~a~reasonable~dis\-tance. }
-\prop_put:Nnn \l_ghsystem_p_prop { 375 } { Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 376 } { Stop~leak~if~safe~to~do~so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 377 } { Lea\-king~gas~fire : \ghsystem_text:\ Do~not~ex\-tin\-guish,~un\-less~leak~can~be~stopped~safe\-ly. }
-\prop_put:Nnn \l_ghsystem_p_prop { 378 } { Use ~ \l_ghsystem_dots_tl\ for~ex\-tinc\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 380 } { Eva\-cu\-ate~area. }
-\prop_put:Nnn \l_ghsystem_p_prop { 381 } { Eli\-mi\-nate~all~igni\-tion~sources~if~safe~to~do~so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 390 } { Ab\-sorb~spillage~to~pre\-vent~ma\-te\-rial~da\-mage. }
-\prop_put:Nnn \l_ghsystem_p_prop { 391 } { Collect~spillage. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 310 } { IF~SWALLOWED : ~ Imme\-diate\-ly~call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 312 } { IF~SWALLOWED : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian~if~you~feel~un\-well. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 330 + 331 } { IF~SWALLOWED : ~ rinse~mouth.~Do~NOT~in\-duce~vo\-mitting. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { IF~ON~SKIN : ~ Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-dages. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 350 } { IF~ON~SKIN : ~ Gent\-ly~wash~with~plen\-ty~of~soap~and~wa\-ter. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 352 } { IF~ON~SKIN : ~ Wash~with~plen\-ty~of~soap~and~wa\-ter. }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { IF~ON~SKIN~(or~hair) : ~ Re\-move/Take~off~imme\-diate\-ly~all~con\-ta\-mi\-na\-ted~clo\-thing.~Rinse~skin~with~wa\-ter/shower. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 340 } { IF~IN\-HALED : ~ Re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 341 } { IF~IN\-HALED : ~ If~brea\-thing~is~diffi\-cult,~re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 + 351 + 338 } { IF~IN~EYES : ~ Rinse~cau\-tious\-ly~with~water~for~se\-ve\-ral~mi\-nutes.~Re\-move~con\-tact~lenses,~if~pre\-sent~and~easy~to~do.~Con\-tinue~rin\-sing. }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 + 360 } { IF~ON~CLO\-THING : ~ Rinse~imme\-diate\-ly~con\-ta\-mi\-na\-ted~clo\-thing~and~skin~with~plen\-ty~of~wa\-ter~be\-fore~re\-moving~clothes. }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 + 311 } { IF~ex\-po\-sed : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 + 313 } { IF~ex\-po\-sed~or~con\-cerned : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 + 311 } { IF~ex\-po\-sed~or~if~you~feel~un\-well : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 + 313 } { If~skin~irri\-ta\-tion~occurs : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 + 313 } { If~skin~irri\-ta\-tion~or~rash~occurs : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { Brush~off~loose~par\-ticles~from~skin.~Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-dages. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 + 313 } { If~eye~irri\-ta\-tion~per\-sists : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 + 311 } { If~ex\-pe\-rien\-cing~res\-pi\-ra\-to\-ry~symp\-toms : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 376 } { In~case~of~fire : ~ Stop~leak~if~safe~to~do~so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 378 } { In~case~of~fire : ~ Use ~ \l_ghsystem_dots_tl\ for~ex\-tinc\-tion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 } { In~case~of~fire : ~ Eva\-cuate~area. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 + 375 } { In~case~of~fire : ~ Eva\-cuate~area.~Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 + 380 + 375 } { In~case~of~ma\-jor~fire~and~large~quan\-ti\-ties : ~ Eva\-cuate~area.~Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 } { IF~SWALLOWED : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 } { IF~ON~SKIN : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 } { IF~ON~SKIN~(or~hair) : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 } { IF~IN\-HALED : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 } { IF~IN~EYES : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 } { IF~ON~CLO\-THING : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 } { IF~ex\-po\-sed : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 } { IF~ex\-po\-sed~or~con\-cerned : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 } { IF~ex\-po\-sed~or~if~you~feel~un\-well : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 310 } { Imme\-diate\-ly~call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 311 } { Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 312 } { Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian~if~you~feel~un\-well. }
+\prop_put:Nnn \l__ghsystem_p_prop { 313 } { Get~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 314 } { Get~me\-di\-cal~ad\-vice/atten\-tion~if~you~feel~un\-well. }
+\prop_put:Nnn \l__ghsystem_p_prop { 315 } { Get~imme\-diate~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 320 } { Spe~ci\-fic~treat\-ment~is~ur\-gent~(see ~ \l__ghsystem_dots_tl\ on~this~la\-bel). }
+\prop_put:Nnn \l__ghsystem_p_prop { 321 } { Spe~ci\-fic~treat\-ment~(see ~ \l__ghsystem_dots_tl\ on~this~la\-bel). }
+\prop_put:Nnn \l__ghsystem_p_prop { 322 } { Spe~ci\-fic~mea\-sures~(see ~ \l__ghsystem_dots_tl\ on~this~la\-bel). }
+\prop_put:Nnn \l__ghsystem_p_prop { 330 } { Rinse~mouth. }
+\prop_put:Nnn \l__ghsystem_p_prop { 331 } { Do~NOT~in\-duce~vo\-mitting. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 } { If~skin~irri\-tation~occurs : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 } { If~skin~irri\-tation~or~rash~occurs : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 334 } { Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-da\-ges. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 } { Brush~off~loose~par\-ticles~from~skin. }
+\prop_put:Nnn \l__ghsystem_p_prop { 336 } { Thaw~frosted~parts~with~luke\-warm~wa\-ter.~Do~not~rub~affec\-ted~area. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 } { If~eye~irri\-ta\-tion~per\-sists : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 338 } { Re\-move~con\-tact~lenses,~if~present~and~easy~to~do.~Con\-tinue~rin\-sing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 340 } { Re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~breathing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 341 } { If~brea\-thing~is~diffi\-cult,~re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 } { If~ex\-pe\-rien\-cing~res\-pi\-ra\-to\-ry~symp\-toms : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 350 } { Gently~wash~with~plen\-ty~of~soap~and~wa\-ter. }
+\prop_put:Nnn \l__ghsystem_p_prop { 351 } { Rinse~cau\-tious\-ly~with~water~for~se\-ve\-ral~mi\-nutes. }
+\prop_put:Nnn \l__ghsystem_p_prop { 352 } { Wash~with~plen\-ty~of~soap~and~wa\-ter. }
+\prop_put:Nnn \l__ghsystem_p_prop { 353 } { Rinse~skin~with~wa\-ter/shower. }
+\prop_put:Nnn \l__ghsystem_p_prop { 360 } { Rinse~imme\-diate\-ly~con\-ta\-mi\-na\-ted~clo\-thing~and~skin~with~plen\-ty~of~wa\-ter~be\-fore~re\-moving~clothes. }
+\prop_put:Nnn \l__ghsystem_p_prop { 361 } { Re\-move/Take~off~imme\-diate\-ly~all~con\-ta\-mi\-na\-ted~clo\-thing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 362 } { Take~off~con\-ta\-mi\-na\-ted~clo\-thing~and~wash~be\-fore~r\-euse. }
+\prop_put:Nnn \l__ghsystem_p_prop { 363 } { Wash~con\-ta\-mi\-na\-ted~clo\-thing~be\-fore~re\-use. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 } { In~case~of~fire : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 } { In~case~of~ma\-jor~fire~and~large~quan\-ti\-ties : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 372 } { Ex\-plo\-sion~risk~in~case~of~fire. }
+\prop_put:Nnn \l__ghsystem_p_prop { 373 } { DO~NOT~fight~fire~when~fire~reaches~ex\-plo\-sives. }
+\prop_put:Nnn \l__ghsystem_p_prop { 374 } { Fight~fire~with~nor\-mal~pre\-cau\-tions~from~a~reasonable~dis\-tance. }
+\prop_put:Nnn \l__ghsystem_p_prop { 375 } { Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 376 } { Stop~leak~if~safe~to~do~so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 377 } { Lea\-king~gas~fire : \ghsystem_text:\ Do~not~ex\-tin\-guish,~un\-less~leak~can~be~stopped~safe\-ly. }
+\prop_put:Nnn \l__ghsystem_p_prop { 378 } { Use ~ \l__ghsystem_dots_tl\ for~ex\-tinc\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 380 } { Eva\-cu\-ate~area. }
+\prop_put:Nnn \l__ghsystem_p_prop { 381 } { Eli\-mi\-nate~all~igni\-tion~sources~if~safe~to~do~so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 390 } { Ab\-sorb~spillage~to~pre\-vent~ma\-te\-rial~da\-mage. }
+\prop_put:Nnn \l__ghsystem_p_prop { 391 } { Collect~spillage. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 310 } { IF~SWALLOWED : ~ Imme\-diate\-ly~call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 312 } { IF~SWALLOWED : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian~if~you~feel~un\-well. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 330 + 331 } { IF~SWALLOWED : ~ rinse~mouth.~Do~NOT~in\-duce~vo\-mitting. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 334 } { IF~ON~SKIN : ~ Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-dages. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 350 } { IF~ON~SKIN : ~ Gent\-ly~wash~with~plen\-ty~of~soap~and~wa\-ter. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 352 } { IF~ON~SKIN : ~ Wash~with~plen\-ty~of~soap~and~wa\-ter. }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 + 361 + 353 } { IF~ON~SKIN~(or~hair) : ~ Re\-move/Take~off~imme\-diate\-ly~all~con\-ta\-mi\-na\-ted~clo\-thing.~Rinse~skin~with~wa\-ter/shower. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 340 } { IF~IN\-HALED : ~ Re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 341 } { IF~IN\-HALED : ~ If~brea\-thing~is~diffi\-cult,~re\-move~vic\-tim~to~fresh~air~and~keep~at~rest~in~a~po\-si\-tion~com\-for\-table~for~brea\-thing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 + 351 + 338 } { IF~IN~EYES : ~ Rinse~cau\-tious\-ly~with~water~for~se\-ve\-ral~mi\-nutes.~Re\-move~con\-tact~lenses,~if~pre\-sent~and~easy~to~do.~Con\-tinue~rin\-sing. }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 + 360 } { IF~ON~CLO\-THING : ~ Rinse~imme\-diate\-ly~con\-ta\-mi\-na\-ted~clo\-thing~and~skin~with~plen\-ty~of~wa\-ter~be\-fore~re\-moving~clothes. }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 + 311 } { IF~ex\-po\-sed : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 + 313 } { IF~ex\-po\-sed~or~con\-cerned : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 + 311 } { IF~ex\-po\-sed~or~if~you~feel~un\-well : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 + 313 } { If~skin~irri\-ta\-tion~occurs : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 + 313 } { If~skin~irri\-ta\-tion~or~rash~occurs : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 + 334 } { Brush~off~loose~par\-ticles~from~skin.~Immerse~in~cool~wa\-ter/wrap~in~wet~ban\-dages. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 + 313 } { If~eye~irri\-ta\-tion~per\-sists : ~ Get~me\-di\-cal~ad\-vice/atten\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 + 311 } { If~ex\-pe\-rien\-cing~res\-pi\-ra\-to\-ry~symp\-toms : ~ Call~a~POI\-SON~CEN\-TER~or~doc\-tor/phy\-si\-cian. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 376 } { In~case~of~fire : ~ Stop~leak~if~safe~to~do~so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 378 } { In~case~of~fire : ~ Use ~ \l__ghsystem_dots_tl\ for~ex\-tinc\-tion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 } { In~case~of~fire : ~ Eva\-cuate~area. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 + 375 } { In~case~of~fire : ~ Eva\-cuate~area.~Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 + 380 + 375 } { In~case~of~ma\-jor~fire~and~large~quan\-ti\-ties : ~ Eva\-cuate~area.~Fight~fire~re\-mote\-ly~due~to~the~risk~of~ex\-plo\-sion. }
 
 % 3.4 Precautionary Statements — Storage
-\prop_put:Nnn \l_ghsystem_p_prop { 401 } { Store ~ \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 } { Store~in~a~dry~place. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 } { Store~in~a~well-ven\-ti\-lated~place. }
-\prop_put:Nnn \l_ghsystem_p_prop { 404 } { Store~in~a~closed~con\-tainer. }
-\prop_put:Nnn \l_ghsystem_p_prop { 405 } { Store~locked~up. }
-\prop_put:Nnn \l_ghsystem_p_prop { 406 } { Store~in~cor\-ro\-sive~re\-sis\-tant / \l_ghsystem_dots_tl\ con\-tai\-ner~with~a~re\-sis\-tant~in\-ner~liner. }
-\prop_put:Nnn \l_ghsystem_p_prop { 407 } { Main\-tain~air~gap~bet\-ween~stacks/pallets. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 } { Pro\-tect~from~sun\-light. }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 412 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 413 } { Store~bulk~masses~greater~than ~ \exp_args:No \SI { \l_ghsystem_kg_mass_tl } { \GHSkilogram } / \exp_args:No \SI { \l_ghsystem_lbs_mass_tl } { \GHSpounds } ~ at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 420 } { Store~away~from~other~ma\-te\-rials. }
-\prop_put:Nnn \l_ghsystem_p_prop { 422 } { Store~con\-tents~un\-der ~ \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 + 404 } { Store~in~a~dry~place.~Store~in~a~closed~con\-tai\-ner. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 233 } { Store~in~a~well-ven\-ti\-la\-ted~place.~Keep~con\-tainer~tight\-ly~closed. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 235 } { Store~in~a~well-ven\-ti\-la\-ted~place.~Keep~cool. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 403 } { Pro\-tect~from~sun\-light.~Store~in~a~well-ven\-ti\-la\-ted~place. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 412 } { Pro\-tect~from~sun\-light.~Do~not~ex\-pose~to~tem\-pera\-tures~ex\-cee\-ding ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 + 235 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ . ~ Keep~cool. }
+\prop_put:Nnn \l__ghsystem_p_prop { 401 } { Store ~ \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 } { Store~in~a~dry~place. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 } { Store~in~a~well-ven\-ti\-lated~place. }
+\prop_put:Nnn \l__ghsystem_p_prop { 404 } { Store~in~a~closed~con\-tainer. }
+\prop_put:Nnn \l__ghsystem_p_prop { 405 } { Store~locked~up. }
+\prop_put:Nnn \l__ghsystem_p_prop { 406 } { Store~in~cor\-ro\-sive~re\-sis\-tant / \l__ghsystem_dots_tl\ con\-tai\-ner~with~a~re\-sis\-tant~in\-ner~liner. }
+\prop_put:Nnn \l__ghsystem_p_prop { 407 } { Main\-tain~air~gap~bet\-ween~stacks/pallets. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 } { Pro\-tect~from~sun\-light. }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 412 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 413 } { Store~bulk~masses~greater~than ~ \exp_args:No \SI { \l__ghsystem_kg_mass_tl } { \GHSkilogram } / \exp_args:No \SI { \l__ghsystem_lbs_mass_tl } { \GHSpounds } ~ at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 420 } { Store~away~from~other~ma\-te\-rials. }
+\prop_put:Nnn \l__ghsystem_p_prop { 422 } { Store~con\-tents~un\-der ~ \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 + 404 } { Store~in~a~dry~place.~Store~in~a~closed~con\-tai\-ner. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 233 } { Store~in~a~well-ven\-ti\-la\-ted~place.~Keep~con\-tainer~tight\-ly~closed. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 235 } { Store~in~a~well-ven\-ti\-la\-ted~place.~Keep~cool. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 403 } { Pro\-tect~from~sun\-light.~Store~in~a~well-ven\-ti\-la\-ted~place. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 412 } { Pro\-tect~from~sun\-light.~Do~not~ex\-pose~to~tem\-pera\-tures~ex\-cee\-ding ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 + 235 } { Store~at~tem\-pera\-tures~not~ex\-cee\-ding ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ . ~ Keep~cool. }
 
 % 3.5 Precautionary Statements — Disposal
-\prop_put:Nnn \l_ghsystem_p_prop { 501 } { Dis\-pose~of~con\-tents/con\-tainer~to ~ \l_ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 501 } { Dis\-pose~of~con\-tents/con\-tainer~to ~ \l__ghsystem_dots_tl }
 
 % 4 Hazard Statement Codes (Annex 6 page 4f)
-\prop_put:Nnn \l_ghsystem_h_prop { 350i } { May~cause~can\-cer~by~in\-ha\-la\-tion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360F } { May~da\-mage~fer\-ti\-li\-ty. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360D } { May~da\-mage~the~un\-born~child. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361f } { Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361d } { Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360FD } { May~da\-mage~fer\-ti\-li\-ty.~May~da\-mage~the~un\-born~child. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361fd } { Suspected~of~damaging~fer\-ti\-li\-ty.~Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Fd } { May~da\-mage~fer\-ti\-li\-ty.~Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Df } { May~da\-mage~the~un\-born~child.~Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty. }
+\prop_put:Nnn \l__ghsystem_h_prop { 350i } { May~cause~can\-cer~by~in\-ha\-la\-tion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360F } { May~da\-mage~fer\-ti\-li\-ty. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360D } { May~da\-mage~the~un\-born~child. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361f } { Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361d } { Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360FD } { May~da\-mage~fer\-ti\-li\-ty.~May~da\-mage~the~un\-born~child. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361fd } { Suspected~of~damaging~fer\-ti\-li\-ty.~Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Fd } { May~da\-mage~fer\-ti\-li\-ty.~Sus\-pec\-ted~of~da\-ma\-ging~the~un\-born~child. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Df } { May~da\-mage~the~un\-born~child.~Sus\-pec\-ted~of~da\-ma\-ging~fer\-ti\-li\-ty. }
 
 \ExplSyntaxOff
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def
index 7d6062e0204..07c2491bf17 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_german.def
@@ -13,7 +13,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -29,21 +29,21 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ExplSyntaxOn
 % GERMAN DEFINITIONS
-\prop_clear:N \l_ghsystem_h_prop
-\prop_clear:N \l_ghsystem_euh_prop
-\prop_clear:N \l_ghsystem_p_prop
+\prop_clear:N \l__ghsystem_h_prop
+\prop_clear:N \l__ghsystem_euh_prop
+\prop_clear:N \l__ghsystem_p_prop
 
 % table head and foot:
-\tl_set:Nn \l_ghsystem_identifier_tl { Nummer }
-\tl_set:Nn \l_ghsystem_table_text_tl { Satz }
-\tl_set:Nn \l_ghsystem_table_next_page_tl { weiter~auf~der~n\"achsten~Seite }
-\tl_set:Nn \l_ghsystem_table_caption_tl { Alle~H,~EUH~und~P~S\"atze. }
+\tl_set:Nn \l__ghsystem_identifier_tl { Nummer }
+\tl_set:Nn \l__ghsystem_table_text_tl { Satz }
+\tl_set:Nn \l__ghsystem_table_next_page_tl { weiter~auf~der~n\"achsten~Seite }
+\tl_set:Nn \l__ghsystem_table_caption_tl { Alle~H,~EUH~und~P~S\"atze. }
 
 % fill-in functions:
 % <state route of exposure if it is conclusively proven that no other routes of exposure cause the hazard>.
 \cs_set:Npn \ghsystem_exposure:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit
           {
@@ -57,7 +57,7 @@
 %  <state specific effect if known> 
 \cs_set:Npn \ghsystem_effect:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit
           {
@@ -71,7 +71,7 @@
 % <or state all organs affected, if known>
 \cs_set:Npn \ghsystem_organs:
   {
-    \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+    \bool_if:nT { \l__ghsystem_fill_in_bool && !\l__ghsystem_organs_bool }
       {
         \c_space_tl \textit
           {
@@ -84,7 +84,7 @@
 
 \cs_set:Npn \ghsystem_substance:
   {
-    \bool_if:NF \l_ghsystem_substance_bool
+    \bool_if:NF \l__ghsystem_substance_bool
       {
         \c_space_tl \textit
           {
@@ -98,265 +98,265 @@
 % GEFAHRENHINWEISE (Anhang 3)
 % 1. Gefahrenhinweise
 % 1.1 physikalische Gefahren
-\prop_put:Nnn \l_ghsystem_h_prop { 200 } { In\-sta\-bil,~ex\-plo\-siv }
-\prop_put:Nnn \l_ghsystem_h_prop { 201 } { Ex\-plo\-siv,~Ge\-fahr~der~Massen\-ex\-plo\-sion. }
-\prop_put:Nnn \l_ghsystem_h_prop { 202 } { Ex\-plo\-siv;~gro\ss e~Ge\-fahr~durch~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
-\prop_put:Nnn \l_ghsystem_h_prop { 203 } { Ex\-plo\-siv;~Ge\-fahr~durch~Feu\-er,~Luft\-druck~oder~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
-\prop_put:Nnn \l_ghsystem_h_prop { 204 } { Ge\-fahr~durch~Feu\-er~oder~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
-\prop_put:Nnn \l_ghsystem_h_prop { 205 } { Ge\-fahr~der~Massen\-ex\-plo\-sion~bei~Feu\-er. }
-\prop_put:Nnn \l_ghsystem_h_prop { 220 } { Ex\-trem~ent\-z\"und\-bares~Gas. }
-\prop_put:Nnn \l_ghsystem_h_prop { 221 } { Ent\-z\"und\-bares~Gas. }
-\prop_put:Nnn \l_ghsystem_h_prop { 222 } { Ex\-trem~ent\-z\"und\-bares~Aero\-sol. }
-\prop_put:Nnn \l_ghsystem_h_prop { 223 } { Ent\-z\"und\-bares~Aero\-sol. }
-\prop_put:Nnn \l_ghsystem_h_prop { 224 } { Fl\"ussig\-keit~und~Dampf~ex\-trem~ent\-z\"und\-bar. }
-\prop_put:Nnn \l_ghsystem_h_prop { 225 } { Fl\"ussig\-keit~und~Dampf~leicht~ent\-z\"und\-bar. }
-\prop_put:Nnn \l_ghsystem_h_prop { 226 } { Fl\"ussig\-keit~und~Dampf~ent\-z\"und\-bar. }
-\prop_put:Nnn \l_ghsystem_h_prop { 228 } { Ent\-z\"und\-barer~Fest\-stoff. }
-\prop_put:Nnn \l_ghsystem_h_prop { 240 } { Er\-w\"ar\-mung~kann~Ex\-plo\-sion~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 241 } { Er\-w\"ar\-mung~kann~Brand~oder~Ex\-plo\-sion~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 242 } { Er\-w\"ar\-mung~kann~Brand~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 250 } { Ent\-z\"un\-det~sich~in~Be\-r\"uh\-rung~mit~Luft~von~selbst. }
-\prop_put:Nnn \l_ghsystem_h_prop { 251 } { Selbst\-er\-hitzungs\-f\"ahig;~kann~in~Brand~ge\-raten. }
-\prop_put:Nnn \l_ghsystem_h_prop { 252 } { In~gro\ss en~Men\-gen~selbst\-er\-hitzungs\-f\"ahig;~kann~in~Brand~ge\-raten. }
-\prop_put:Nnn \l_ghsystem_h_prop { 260 } { In~Be\-r\"uh\-rung~mit~Wasser~ent\-ste\-hen~ent\-z\"und\-bare~Gase,~die~sich~spon\-tan~entz\"un\-den~k\"on\-nen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 261 } { In~Be\-r\"uh\-rung~mit~Wasser~ent\-ste\-hen~ent\-z\"und\-bare~Gase. }
-\prop_put:Nnn \l_ghsystem_h_prop { 270 } { Kann~Brand~ver\-ur\-sachen~oder~ver\-st\"ar\-ken;~Oxidations\-mittel. }
-\prop_put:Nnn \l_ghsystem_h_prop { 271 } { Kann~Brand~oder~Ex\-plo\-sion~ver\-ur\-sachen;~star\-kes~Oxidations\-mittel. }
-\prop_put:Nnn \l_ghsystem_h_prop { 272 } { Kann~Brand~ver\-st\"ar\-ken;~Oxidations\-mittel. }
-\prop_put:Nnn \l_ghsystem_h_prop { 280 } { Ent\-h\"alt~Gas~unter~Druck;~kann~bei~Er\-w\"ar\-mung~ex\-plo\-die\-ren. }
-\prop_put:Nnn \l_ghsystem_h_prop { 281 } { Ent\-h\"alt~tief\-kal\-tes~Gas;~kann~K\"alte\-ver\-bren\-nungen~oder~-Ver\-letzun\-gen~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 290 } { Kann~ge\-gen\-\"uber~Me\-tallen~korro\-siv~sein. }
+\prop_put:Nnn \l__ghsystem_h_prop { 200 } { In\-sta\-bil,~ex\-plo\-siv }
+\prop_put:Nnn \l__ghsystem_h_prop { 201 } { Ex\-plo\-siv,~Ge\-fahr~der~Massen\-ex\-plo\-sion. }
+\prop_put:Nnn \l__ghsystem_h_prop { 202 } { Ex\-plo\-siv;~gro\ss e~Ge\-fahr~durch~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
+\prop_put:Nnn \l__ghsystem_h_prop { 203 } { Ex\-plo\-siv;~Ge\-fahr~durch~Feu\-er,~Luft\-druck~oder~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
+\prop_put:Nnn \l__ghsystem_h_prop { 204 } { Ge\-fahr~durch~Feu\-er~oder~Splitter,~Spreng-~und~Wurf\-st\"ucke. }
+\prop_put:Nnn \l__ghsystem_h_prop { 205 } { Ge\-fahr~der~Massen\-ex\-plo\-sion~bei~Feu\-er. }
+\prop_put:Nnn \l__ghsystem_h_prop { 220 } { Ex\-trem~ent\-z\"und\-bares~Gas. }
+\prop_put:Nnn \l__ghsystem_h_prop { 221 } { Ent\-z\"und\-bares~Gas. }
+\prop_put:Nnn \l__ghsystem_h_prop { 222 } { Ex\-trem~ent\-z\"und\-bares~Aero\-sol. }
+\prop_put:Nnn \l__ghsystem_h_prop { 223 } { Ent\-z\"und\-bares~Aero\-sol. }
+\prop_put:Nnn \l__ghsystem_h_prop { 224 } { Fl\"ussig\-keit~und~Dampf~ex\-trem~ent\-z\"und\-bar. }
+\prop_put:Nnn \l__ghsystem_h_prop { 225 } { Fl\"ussig\-keit~und~Dampf~leicht~ent\-z\"und\-bar. }
+\prop_put:Nnn \l__ghsystem_h_prop { 226 } { Fl\"ussig\-keit~und~Dampf~ent\-z\"und\-bar. }
+\prop_put:Nnn \l__ghsystem_h_prop { 228 } { Ent\-z\"und\-barer~Fest\-stoff. }
+\prop_put:Nnn \l__ghsystem_h_prop { 240 } { Er\-w\"ar\-mung~kann~Ex\-plo\-sion~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 241 } { Er\-w\"ar\-mung~kann~Brand~oder~Ex\-plo\-sion~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 242 } { Er\-w\"ar\-mung~kann~Brand~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 250 } { Ent\-z\"un\-det~sich~in~Be\-r\"uh\-rung~mit~Luft~von~selbst. }
+\prop_put:Nnn \l__ghsystem_h_prop { 251 } { Selbst\-er\-hitzungs\-f\"ahig;~kann~in~Brand~ge\-raten. }
+\prop_put:Nnn \l__ghsystem_h_prop { 252 } { In~gro\ss en~Men\-gen~selbst\-er\-hitzungs\-f\"ahig;~kann~in~Brand~ge\-raten. }
+\prop_put:Nnn \l__ghsystem_h_prop { 260 } { In~Be\-r\"uh\-rung~mit~Wasser~ent\-ste\-hen~ent\-z\"und\-bare~Gase,~die~sich~spon\-tan~entz\"un\-den~k\"on\-nen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 261 } { In~Be\-r\"uh\-rung~mit~Wasser~ent\-ste\-hen~ent\-z\"und\-bare~Gase. }
+\prop_put:Nnn \l__ghsystem_h_prop { 270 } { Kann~Brand~ver\-ur\-sachen~oder~ver\-st\"ar\-ken;~Oxidations\-mittel. }
+\prop_put:Nnn \l__ghsystem_h_prop { 271 } { Kann~Brand~oder~Ex\-plo\-sion~ver\-ur\-sachen;~star\-kes~Oxidations\-mittel. }
+\prop_put:Nnn \l__ghsystem_h_prop { 272 } { Kann~Brand~ver\-st\"ar\-ken;~Oxidations\-mittel. }
+\prop_put:Nnn \l__ghsystem_h_prop { 280 } { Ent\-h\"alt~Gas~unter~Druck;~kann~bei~Er\-w\"ar\-mung~ex\-plo\-die\-ren. }
+\prop_put:Nnn \l__ghsystem_h_prop { 281 } { Ent\-h\"alt~tief\-kal\-tes~Gas;~kann~K\"alte\-ver\-bren\-nungen~oder~-Ver\-letzun\-gen~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 290 } { Kann~ge\-gen\-\"uber~Me\-tallen~korro\-siv~sein. }
 
 % 1.2 Gesundheitsgefahren
-\prop_put:Nnn \l_ghsystem_h_prop { 300 } { Le\-bens\-ge\-fahr~bei~Ver\-schlucken. }
-\prop_put:Nnn \l_ghsystem_h_prop { 301 } { Giftig~bei~Ver\-schlucken. }
-\prop_put:Nnn \l_ghsystem_h_prop { 302 } { Ge\-sund\-heits\-sch\"ad\-lich~bei~Ver\-schlucken. }
-\prop_put:Nnn \l_ghsystem_h_prop { 304 } { Kann~bei~Ver\-schlucken~und~Ein\-dringen~in~die~Atem\-wege~t\"od\-lich~sein. }
-\prop_put:Nnn \l_ghsystem_h_prop { 310 } { Le\-bens\-ge\-fahr~bei~Haut\-kon\-takt. }
-\prop_put:Nnn \l_ghsystem_h_prop { 311 } { Giftig~bei~Haut\-kontakt. }
-\prop_put:Nnn \l_ghsystem_h_prop { 312 } { Ge\-sund\-heits\-sch\"adlich~bei~Haut\-kontakt. }
-\prop_put:Nnn \l_ghsystem_h_prop { 314 } { Ver\-ur\-sacht~schwere~Ver\"atzun\-gen~der~Haut~und~schwe\-re~Au\-gen\-sch\"a\-den. }
-\prop_put:Nnn \l_ghsystem_h_prop { 315 } { Ver\-ur\-sacht~Haut\-rei\-zun\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 317 } { Kann~aller\-gi\-sche~Haut\-reak\-tio\-nen~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 318 } { Ver\-ur\-sacht~schwe\-re~Au\-gen\-sch\"a\-den. }
-\prop_put:Nnn \l_ghsystem_h_prop { 319 } { Ver\-ur\-sacht~schwe\-re~Au\-gen\-rei\-zung. }
-\prop_put:Nnn \l_ghsystem_h_prop { 330 } { Le\-bens\-ge\-fahr~bei~Ein\-at\-men. }
-\prop_put:Nnn \l_ghsystem_h_prop { 331 } { Giftig~bei~Ein\-at\-men. }
-\prop_put:Nnn \l_ghsystem_h_prop { 332 } { Ge\-sund\-heits\-sch\"ad\-lich~bei~Ein\-at\-men. }
-\prop_put:Nnn \l_ghsystem_h_prop { 334 } { Kann~bei~Ein\-at\-men~Aller\-gie,~asthma\-arti\-ge~Sym\-ptome~oder~Atem\-be\-schwer\-den~ver\-ur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 335 } { Kann~die~Atem\-wege~rei\-zen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 336 } { Kann~Schl\"af\-rig\-keit~und~Be\-nommen\-heit~ve\-rur\-sachen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 340 } { Kann~ge\-ne\-tische~De\-fek\-te~ve\-rur\-sachen. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 341 } { Kann~ver\-mut\-lich~ge\-netische~De\-fek\-te~ver\-ur\-sachen. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 350 } { Kann~Krebs~er\-zeu\-gen. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 351 } { Kann~ver\-mut\-lich~Krebs~er\-zeu\-gen. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 360 } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-tigen~oder~das~Kind~im~Mutter\-leib~sch\"a\-digen. \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 361 } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-tigen~oder~das~Kind~im~Mutter\-leib~sch\"a\-digen. \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 362 } { Kann~S\"aug\-linge~\"uber~die~Mutter\-milch~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 370 } { Sch\"a\-digt \bool_if:NF \l_ghsystem_organs_bool { ~ die~Or\-gane } \ghsystem_organs: . \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 371 } { Kann \bool_if:NF \l_ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs: ~ sch\"a\-di\-gen. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 372 } { Sch\"a\-digt \bool_if:NF \l_ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs:\ bei~l\"angerer~oder~wie\-der\-hol\-ter~Ex\-po\-si\-tion. \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 373 } { Kann \bool_if:NF \l_ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs:\ sch\"a\-di\-gen~bei~l\"angerer~oder~wie\-der\-hol\-ter~Ex\-po\-si\-tion. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 300 } { Le\-bens\-ge\-fahr~bei~Ver\-schlucken. }
+\prop_put:Nnn \l__ghsystem_h_prop { 301 } { Giftig~bei~Ver\-schlucken. }
+\prop_put:Nnn \l__ghsystem_h_prop { 302 } { Ge\-sund\-heits\-sch\"ad\-lich~bei~Ver\-schlucken. }
+\prop_put:Nnn \l__ghsystem_h_prop { 304 } { Kann~bei~Ver\-schlucken~und~Ein\-dringen~in~die~Atem\-wege~t\"od\-lich~sein. }
+\prop_put:Nnn \l__ghsystem_h_prop { 310 } { Le\-bens\-ge\-fahr~bei~Haut\-kon\-takt. }
+\prop_put:Nnn \l__ghsystem_h_prop { 311 } { Giftig~bei~Haut\-kontakt. }
+\prop_put:Nnn \l__ghsystem_h_prop { 312 } { Ge\-sund\-heits\-sch\"adlich~bei~Haut\-kontakt. }
+\prop_put:Nnn \l__ghsystem_h_prop { 314 } { Ver\-ur\-sacht~schwere~Ver\"atzun\-gen~der~Haut~und~schwe\-re~Au\-gen\-sch\"a\-den. }
+\prop_put:Nnn \l__ghsystem_h_prop { 315 } { Ver\-ur\-sacht~Haut\-rei\-zun\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 317 } { Kann~aller\-gi\-sche~Haut\-reak\-tio\-nen~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 318 } { Ver\-ur\-sacht~schwe\-re~Au\-gen\-sch\"a\-den. }
+\prop_put:Nnn \l__ghsystem_h_prop { 319 } { Ver\-ur\-sacht~schwe\-re~Au\-gen\-rei\-zung. }
+\prop_put:Nnn \l__ghsystem_h_prop { 330 } { Le\-bens\-ge\-fahr~bei~Ein\-at\-men. }
+\prop_put:Nnn \l__ghsystem_h_prop { 331 } { Giftig~bei~Ein\-at\-men. }
+\prop_put:Nnn \l__ghsystem_h_prop { 332 } { Ge\-sund\-heits\-sch\"ad\-lich~bei~Ein\-at\-men. }
+\prop_put:Nnn \l__ghsystem_h_prop { 334 } { Kann~bei~Ein\-at\-men~Aller\-gie,~asthma\-arti\-ge~Sym\-ptome~oder~Atem\-be\-schwer\-den~ver\-ur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 335 } { Kann~die~Atem\-wege~rei\-zen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 336 } { Kann~Schl\"af\-rig\-keit~und~Be\-nommen\-heit~ve\-rur\-sachen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 340 } { Kann~ge\-ne\-tische~De\-fek\-te~ve\-rur\-sachen. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 341 } { Kann~ver\-mut\-lich~ge\-netische~De\-fek\-te~ver\-ur\-sachen. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 350 } { Kann~Krebs~er\-zeu\-gen. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 351 } { Kann~ver\-mut\-lich~Krebs~er\-zeu\-gen. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 360 } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-tigen~oder~das~Kind~im~Mutter\-leib~sch\"a\-digen. \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 361 } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-tigen~oder~das~Kind~im~Mutter\-leib~sch\"a\-digen. \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 362 } { Kann~S\"aug\-linge~\"uber~die~Mutter\-milch~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 370 } { Sch\"a\-digt \bool_if:NF \l__ghsystem_organs_bool { ~ die~Or\-gane } \ghsystem_organs: . \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 371 } { Kann \bool_if:NF \l__ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs: ~ sch\"a\-di\-gen. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 372 } { Sch\"a\-digt \bool_if:NF \l__ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs:\ bei~l\"angerer~oder~wie\-der\-hol\-ter~Ex\-po\-si\-tion. \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 373 } { Kann \bool_if:NF \l__ghsystem_organs_bool { ~die~Or\-gane } \ghsystem_organs:\ sch\"a\-di\-gen~bei~l\"angerer~oder~wie\-der\-hol\-ter~Ex\-po\-si\-tion. \ghsystem_exposure: }
 
 % 1.3 Umweltgefahren
-\prop_put:Nnn \l_ghsystem_h_prop { 400 } { Sehr~giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men. }
-\prop_put:Nnn \l_ghsystem_h_prop { 410 } { Sehr~giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
-\prop_put:Nnn \l_ghsystem_h_prop { 411 } { Giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
-\prop_put:Nnn \l_ghsystem_h_prop { 412 } { Sch\"ad\-lich~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
-\prop_put:Nnn \l_ghsystem_h_prop { 413 } { Kann~f\"ur~Was\-ser\-or\-ga\-nis\-men~sch\"ad\-lich~sein, mit~lang\-fris\-ti\-ger~Wir\-kung. }
+\prop_put:Nnn \l__ghsystem_h_prop { 400 } { Sehr~giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men. }
+\prop_put:Nnn \l__ghsystem_h_prop { 410 } { Sehr~giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
+\prop_put:Nnn \l__ghsystem_h_prop { 411 } { Giftig~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
+\prop_put:Nnn \l__ghsystem_h_prop { 412 } { Sch\"ad\-lich~f\"ur~Was\-ser\-or\-ga\-nis\-men,~mit~lang\-fris\-ti\-ger~Wir\-kung. }
+\prop_put:Nnn \l__ghsystem_h_prop { 413 } { Kann~f\"ur~Was\-ser\-or\-ga\-nis\-men~sch\"ad\-lich~sein, mit~lang\-fris\-ti\-ger~Wir\-kung. }
 
 % 2 Ergänzende Gefahrenmerkmale
 % 2.1 physikalische Gefahren
-\prop_put:Nnn \l_ghsystem_euh_prop { 001 } { In~trocke\-nem~Zu\-stand~ex\-plo\-sions\-ge\-f\"ahr\-lich. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 006 } { Mit~und~ohne~Luft~ex\-plo\-sions\-f\"a\-hig. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 014 } { Rea\-giert~heftig~mit~Was\-ser. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { Kann~bei~Ver\-wen\-dung~ex\-plo\-sions\-f\"a\-hige/ent\-z\"und\-bare~Dampf/Luft-Ge\-mi\-sche~bil\-den. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 019 } { Kann~ex\-plo\-sions\-f\"a\-hige~Per\-oxide~bil\-den. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 044 } { Ex\-plo\-sions\-ge\-fahr~bei~Er\-hitzen~un\-ter~Ein\-schluss. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 001 } { In~trocke\-nem~Zu\-stand~ex\-plo\-sions\-ge\-f\"ahr\-lich. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 006 } { Mit~und~ohne~Luft~ex\-plo\-sions\-f\"a\-hig. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 014 } { Rea\-giert~heftig~mit~Was\-ser. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 018 } { Kann~bei~Ver\-wen\-dung~ex\-plo\-sions\-f\"a\-hige/ent\-z\"und\-bare~Dampf/Luft-Ge\-mi\-sche~bil\-den. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 019 } { Kann~ex\-plo\-sions\-f\"a\-hige~Per\-oxide~bil\-den. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 044 } { Ex\-plo\-sions\-ge\-fahr~bei~Er\-hitzen~un\-ter~Ein\-schluss. }
 
 % 2.2 Gesundheitsgefähliche Eigenschaften
-\prop_put:Nnn \l_ghsystem_euh_prop { 029 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~Was\-ser~gifti\-ge~Ga\-se. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 031 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~S\"au\-re~gifti\-ge~Ga\-se. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 032 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~S\"au\-re~sehr~gifti\-ge~Ga\-se. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 066 } { Wie\-der\-holter~Kon\-takt~kann~zu~spr\"o\-der~oder~rissi\-ger~Haut~f\"uh\-ren. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 070 } { Giftig~bei~Be\-r\"uh\-rung~mit~den~Au\-gen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 071 } { Wirkt~\"atzend~auf~die~Atem\-we\-ge. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 029 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~Was\-ser~gifti\-ge~Ga\-se. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 031 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~S\"au\-re~gifti\-ge~Ga\-se. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 032 } { Ent\-wickelt~bei~Be\-r\"uh\-rung~mit~S\"au\-re~sehr~gifti\-ge~Ga\-se. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 066 } { Wie\-der\-holter~Kon\-takt~kann~zu~spr\"o\-der~oder~rissi\-ger~Haut~f\"uh\-ren. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 070 } { Giftig~bei~Be\-r\"uh\-rung~mit~den~Au\-gen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 071 } { Wirkt~\"atzend~auf~die~Atem\-we\-ge. }
 
 % 2.3 Umweltgefährliche Eigenschaften
-\prop_put:Nnn \l_ghsystem_euh_prop { 059 } { Die~Ozon\-schicht~sch\"a\-di\-gend. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 059 } { Die~Ozon\-schicht~sch\"a\-di\-gend. }
 
 % 2.4 Ergänzende Kennzeichnungselemente / Informationen über bestimmte Stoffe und Gemische
-\prop_put:Nnn \l_ghsystem_euh_prop { 201 } { Ent\-h\"alt~Blei.~Nicht~f\"ur~den~An\-strich~von~Ge\-gen\-st\"an\-den~ver\-wen\-den,~die~von~Kin\-dern~ge\-kaut~oder~ge\-lutscht~wer\-den~k\"onn\-ten. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 201A } { Ach\-tung!~Ent\-h\"alt~Blei. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 202 } { \iupac{Cyan\|acryl\|at}.~Ge\-fahr.~Klebt~inner\-halb~von~Se\-kun\-den~Haut~und~Au\-gen\-li\-der~zu\-sam\-men.~Darf~nicht~in~die~H\"an\-de~von~Kin\-dern~ge\-lan\-gen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 203 } { Ent\-h\"alt~\ox[pos=side]{6,Chrom}.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 204 } { Ent\-h\"alt~\iupac{Iso\|cyan\|ate}.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 205 } { Ent\-h\"alt~epoxid\-halti\-ge~Ver\-bin\-dun\-gen.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 206 } { Ach\-tung!~Nicht~zu\-sam\-men~mit~an\-de\-ren~Pro\-duk\-ten~ver\-wen\-den,~da~ge\-f\"ahr\-liche~Ga\-se~(Chlor)~frei\-ge\-setzt~wer\-den~k\"on\-nen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 207 } { Ach\-tung!~Ent\-h\"alt~Cad\-mium.~Bei~der~Ver\-wen\-dung~ent\-ste\-hen~ge\-f\"ahr\-liche~D\"ampfe.~Hin\-wei\-se~des~Her\-stellers~be\-ach\-ten.~Sicher\-heits\-an\-wei\-sungen~ein\-halten. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { Ent\-h\"alt \ghsystem_substance: .~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209 } { Kann~bei~Ver\-wen\-dung~leicht~ent\-z\"und\-bar~wer\-den. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209A } { Kann~bei~Ver\-wen\-dung~ent\-z\"und\-bar~wer\-den. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 210 } { Sicher\-heits\-da\-ten\-blatt~auf~An\-fra\-ge~er\-h\"alt\-lich. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 401 } { Zur~Ver\-mei\-dung~von~Ri\-si\-ken~f\"ur~Mensch~und~Um\-welt~die~Ge\-brauchs\-an\-lei\-tung~ein\-halten. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201 } { Ent\-h\"alt~Blei.~Nicht~f\"ur~den~An\-strich~von~Ge\-gen\-st\"an\-den~ver\-wen\-den,~die~von~Kin\-dern~ge\-kaut~oder~ge\-lutscht~wer\-den~k\"onn\-ten. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201A } { Ach\-tung!~Ent\-h\"alt~Blei. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 202 } { \iupac{Cyan\|acryl\|at}.~Ge\-fahr.~Klebt~inner\-halb~von~Se\-kun\-den~Haut~und~Au\-gen\-li\-der~zu\-sam\-men.~Darf~nicht~in~die~H\"an\-de~von~Kin\-dern~ge\-lan\-gen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 203 } { Ent\-h\"alt~\ox[pos=side]{6,Chrom}.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 204 } { Ent\-h\"alt~\iupac{Iso\|cyan\|ate}.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 205 } { Ent\-h\"alt~epoxid\-halti\-ge~Ver\-bin\-dun\-gen.~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 206 } { Ach\-tung!~Nicht~zu\-sam\-men~mit~an\-de\-ren~Pro\-duk\-ten~ver\-wen\-den,~da~ge\-f\"ahr\-liche~Ga\-se~(Chlor)~frei\-ge\-setzt~wer\-den~k\"on\-nen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 207 } { Ach\-tung!~Ent\-h\"alt~Cad\-mium.~Bei~der~Ver\-wen\-dung~ent\-ste\-hen~ge\-f\"ahr\-liche~D\"ampfe.~Hin\-wei\-se~des~Her\-stellers~be\-ach\-ten.~Sicher\-heits\-an\-wei\-sungen~ein\-halten. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 208 } { Ent\-h\"alt \ghsystem_substance: .~Kann~aller\-gi\-sche~Re\-ak\-tio\-nen~her\-vor\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209 } { Kann~bei~Ver\-wen\-dung~leicht~ent\-z\"und\-bar~wer\-den. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209A } { Kann~bei~Ver\-wen\-dung~ent\-z\"und\-bar~wer\-den. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 210 } { Sicher\-heits\-da\-ten\-blatt~auf~An\-fra\-ge~er\-h\"alt\-lich. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 401 } { Zur~Ver\-mei\-dung~von~Ri\-si\-ken~f\"ur~Mensch~und~Um\-welt~die~Ge\-brauchs\-an\-lei\-tung~ein\-halten. }
 
 % SICHERHEITSHINWEISE (Anhang 4 ab Seite 19)
 % 3 Sicherheitshinweise
 % 3.1 Allgemeines
-\prop_put:Nnn \l_ghsystem_p_prop { 101 } { Ist~\"arzt\-licher~Rat~er\-for\-der\-lich,~Ver\-packung~oder~Kenn\-zeich\-nungs\-eti\-kett~be\-reit\-hal\-ten. }
-\prop_put:Nnn \l_ghsystem_p_prop { 102 } { Darf~nicht~in~die~H\"an\-de~von~Kin\-dern~ge\-lan\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 103 } { Vor~Ge\-brauch~Kenn\-zeich\-nungs\-eti\-kett~lesen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 101 } { Ist~\"arzt\-licher~Rat~er\-for\-der\-lich,~Ver\-packung~oder~Kenn\-zeich\-nungs\-eti\-kett~be\-reit\-hal\-ten. }
+\prop_put:Nnn \l__ghsystem_p_prop { 102 } { Darf~nicht~in~die~H\"an\-de~von~Kin\-dern~ge\-lan\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 103 } { Vor~Ge\-brauch~Kenn\-zeich\-nungs\-eti\-kett~lesen. }
 
 % 3.2 Sicherheitshinweise — Prävention
-\prop_put:Nnn \l_ghsystem_p_prop { 201 } { Vor~Ge\-brauch~be\-son\-de\-re~An\-wei\-sungen~ein\-ho\-len. }
-\prop_put:Nnn \l_ghsystem_p_prop { 202 } { Vor~Ge\-brauch~alle~Sicher\-heits\-hin\-wei\-se~le\-sen~und~ver\-ste\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 210 } { Von~Hitze/Fun\-ken/offe\-ner~Flam\-me/hei\ss en~Ober\-fl\"achen~fern\-hal\-ten.~Nicht~rau\-chen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 211 } { Nicht~ge\-gen~offe\-ne~Flam\-me~oder~an\-de\-re~Z\"und\-quelle~spr\"u\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 220 } { Von~Klei\-dung/\l_ghsystem_dots_tl /brenn\-ba\-ren~Ma\-te\-ria\-lien~fern\-hal\-ten/ent\-fernt~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 221 } { Mischen~mit~brenn\-ba\-ren~Stoffen/\l_ghsystem_dots_tl\ un\-be\-dingt~ver\-hin\-dern. }
-\prop_put:Nnn \l_ghsystem_p_prop { 222 } { Kon\-takt~mit~Luft~nicht~zu\-lassen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 223 } { Kon\-takt~mit~Was\-ser~we\-gen~hefti\-ger~Re\-ak\-tion~und~m\"og\-lichem~Auf\-flam\-men~un\-be\-dingt~ver\-hin\-dern. }
-\prop_put:Nnn \l_ghsystem_p_prop { 230 } { Feucht~hal\-ten~mit~\l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 } { Un\-ter~inertem~Gas~hand\-ha\-ben. }
-\prop_put:Nnn \l_ghsystem_p_prop { 232 } { Vor~Feuch\-tig\-keit~sch\"utzen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 233 } { Be\-h\"alter~dicht~ver\-schlos\-sen~hal\-en. }
-\prop_put:Nnn \l_ghsystem_p_prop { 234 } { Nur~im~Ori\-gi\-nal\-be\-h\"alter~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 } { K\"uhl~hal\-ten. }
-\prop_put:Nnn \l_ghsystem_p_prop { 240 } { Be\-h\"alter~und~zu~be\-f\"ullen\-de~An\-la\-ge~er\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 241 } { Ex\-plo\-sions\-ge\-sch\"utzte~e\-lek\-tri\-sche~Be\-triebs\-mittel/L\"uftungs\-an\-la\-gen/Be\-leuch\-tung/\l_ghsystem_dots_tl\ ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 242 } { Nur~fun\-ken\-frei\-es~Werk\-zeug~ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 243 } { Ma\ss\-nah\-men~ge\-gen~e\-lek\-tro\-sta\-ti\-sche~Auf\-la\-dungen~treffen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 244 } { Druck\-min\-de\-rer~frei~von~Fett~und~\"Ol~hal\-ten. }
-\prop_put:Nnn \l_ghsystem_p_prop { 250 } { Nicht~schlei\-fen/sto\ss\-en/\l_ghsystem_dots_tl /rei\-ben. }
-\prop_put:Nnn \l_ghsystem_p_prop { 251 } { Be\-h\"alter~steht~un\-ter~Druck:~Nicht~durch\-ste\-chen~oder~ver\-bren\-nen,~auch~nicht~nach~der~Ver\-wen\-dung. }
-\prop_put:Nnn \l_ghsystem_p_prop { 260 } { Staub/Rauch/Gas/Ne\-bel/Dampf/Aero\-sol~nicht~ein\-at\-men. }
-\prop_put:Nnn \l_ghsystem_p_prop { 261 } { Ein\-at\-men~von~Staub/Rauch/Gas/Ne\-bel/Dampf/Aero\-sol~ver\-mei\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 262 } { Nicht~in~die~Au\-gen,~auf~die~Haut~oder~auf~die~Klei\-dung~ge\-langen~las\-sen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 263 } { Kon\-takt~w\"ah\-rend~der~Schwan\-ger\-schaft~und~der~Still\-zeit~ver\-mei\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 264 } { Nach~Ge\-brauch~\l_ghsystem_dots_tl\ gr\"und\-lich~waschen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 270 } { Bei~Ge\-brauch~nicht essen, trinken oder rauchen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 271 } { Nur~im~Frei\-en~oder~in~gut~be\-l\"ufte\-ten~R\"au\-men~ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 272 } { Kon\-ta\-mi\-nier\-te~Ar\-beits\-klei\-dung~nicht~au\ss er\-halb~des~Ar\-beits\-platzes~tra\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 273 } { Frei\-setzung~in~die~Um\-welt~ver\-mei\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 280 } { Schutz\-hand\-schu\-he/Schutz\-klei\-dung/Au\-gen\-schutz/Ge\-sichts\-schutz~tra\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 281 } { Vor\-ge\-schrie\-be\-ne~per\-s\"on\-li\-che~Schutz\-aus\-r\"us\-tung~ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 282 } { Schutz\-hand\-schu\-he/Ge\-sichts\-schild/Au\-gen\-schutz~mit~K\"alte\-iso\-lie\-rung~tra\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 283 } { Schwer~ent\-flamm\-ba\-re/flamm\-hem\-men\-de~Klei\-dung~tra\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 284 } { Atem\-schutz~tragen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 285 } { Bei~un\-zu\-rei\-chen\-der~Be\-l\"uftung~Atem\-schutz~tra\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 + 232 } { Un\-ter~in\-er\-tem~Gas~hand\-ha\-ben.~Vor~Feuch\-tig\-keit~sch\"utzen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 + 410 } { K\"uhl~halten.~Vor~Son\-nen\-be\-strah\-lung~sch\"utzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 201 } { Vor~Ge\-brauch~be\-son\-de\-re~An\-wei\-sungen~ein\-ho\-len. }
+\prop_put:Nnn \l__ghsystem_p_prop { 202 } { Vor~Ge\-brauch~alle~Sicher\-heits\-hin\-wei\-se~le\-sen~und~ver\-ste\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 210 } { Von~Hitze/Fun\-ken/offe\-ner~Flam\-me/hei\ss en~Ober\-fl\"achen~fern\-hal\-ten.~Nicht~rau\-chen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 211 } { Nicht~ge\-gen~offe\-ne~Flam\-me~oder~an\-de\-re~Z\"und\-quelle~spr\"u\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 220 } { Von~Klei\-dung/\l__ghsystem_dots_tl /brenn\-ba\-ren~Ma\-te\-ria\-lien~fern\-hal\-ten/ent\-fernt~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 221 } { Mischen~mit~brenn\-ba\-ren~Stoffen/\l__ghsystem_dots_tl\ un\-be\-dingt~ver\-hin\-dern. }
+\prop_put:Nnn \l__ghsystem_p_prop { 222 } { Kon\-takt~mit~Luft~nicht~zu\-lassen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 223 } { Kon\-takt~mit~Was\-ser~we\-gen~hefti\-ger~Re\-ak\-tion~und~m\"og\-lichem~Auf\-flam\-men~un\-be\-dingt~ver\-hin\-dern. }
+\prop_put:Nnn \l__ghsystem_p_prop { 230 } { Feucht~hal\-ten~mit~\l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 } { Un\-ter~inertem~Gas~hand\-ha\-ben. }
+\prop_put:Nnn \l__ghsystem_p_prop { 232 } { Vor~Feuch\-tig\-keit~sch\"utzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 233 } { Be\-h\"alter~dicht~ver\-schlos\-sen~hal\-en. }
+\prop_put:Nnn \l__ghsystem_p_prop { 234 } { Nur~im~Ori\-gi\-nal\-be\-h\"alter~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 } { K\"uhl~hal\-ten. }
+\prop_put:Nnn \l__ghsystem_p_prop { 240 } { Be\-h\"alter~und~zu~be\-f\"ullen\-de~An\-la\-ge~er\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 241 } { Ex\-plo\-sions\-ge\-sch\"utzte~e\-lek\-tri\-sche~Be\-triebs\-mittel/L\"uftungs\-an\-la\-gen/Be\-leuch\-tung/\l__ghsystem_dots_tl\ ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 242 } { Nur~fun\-ken\-frei\-es~Werk\-zeug~ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 243 } { Ma\ss\-nah\-men~ge\-gen~e\-lek\-tro\-sta\-ti\-sche~Auf\-la\-dungen~treffen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 244 } { Druck\-min\-de\-rer~frei~von~Fett~und~\"Ol~hal\-ten. }
+\prop_put:Nnn \l__ghsystem_p_prop { 250 } { Nicht~schlei\-fen/sto\ss\-en/\l__ghsystem_dots_tl /rei\-ben. }
+\prop_put:Nnn \l__ghsystem_p_prop { 251 } { Be\-h\"alter~steht~un\-ter~Druck:~Nicht~durch\-ste\-chen~oder~ver\-bren\-nen,~auch~nicht~nach~der~Ver\-wen\-dung. }
+\prop_put:Nnn \l__ghsystem_p_prop { 260 } { Staub/Rauch/Gas/Ne\-bel/Dampf/Aero\-sol~nicht~ein\-at\-men. }
+\prop_put:Nnn \l__ghsystem_p_prop { 261 } { Ein\-at\-men~von~Staub/Rauch/Gas/Ne\-bel/Dampf/Aero\-sol~ver\-mei\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 262 } { Nicht~in~die~Au\-gen,~auf~die~Haut~oder~auf~die~Klei\-dung~ge\-langen~las\-sen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 263 } { Kon\-takt~w\"ah\-rend~der~Schwan\-ger\-schaft~und~der~Still\-zeit~ver\-mei\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 264 } { Nach~Ge\-brauch~\l__ghsystem_dots_tl\ gr\"und\-lich~waschen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 270 } { Bei~Ge\-brauch~nicht essen, trinken oder rauchen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 271 } { Nur~im~Frei\-en~oder~in~gut~be\-l\"ufte\-ten~R\"au\-men~ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 272 } { Kon\-ta\-mi\-nier\-te~Ar\-beits\-klei\-dung~nicht~au\ss er\-halb~des~Ar\-beits\-platzes~tra\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 273 } { Frei\-setzung~in~die~Um\-welt~ver\-mei\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 280 } { Schutz\-hand\-schu\-he/Schutz\-klei\-dung/Au\-gen\-schutz/Ge\-sichts\-schutz~tra\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 281 } { Vor\-ge\-schrie\-be\-ne~per\-s\"on\-li\-che~Schutz\-aus\-r\"us\-tung~ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 282 } { Schutz\-hand\-schu\-he/Ge\-sichts\-schild/Au\-gen\-schutz~mit~K\"alte\-iso\-lie\-rung~tra\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 283 } { Schwer~ent\-flamm\-ba\-re/flamm\-hem\-men\-de~Klei\-dung~tra\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 284 } { Atem\-schutz~tragen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 285 } { Bei~un\-zu\-rei\-chen\-der~Be\-l\"uftung~Atem\-schutz~tra\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 + 232 } { Un\-ter~in\-er\-tem~Gas~hand\-ha\-ben.~Vor~Feuch\-tig\-keit~sch\"utzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 + 410 } { K\"uhl~halten.~Vor~Son\-nen\-be\-strah\-lung~sch\"utzen. }
 
 % 3.3 Sicherheitshinweise — Reaktion
-\prop_put:Nnn \l_ghsystem_p_prop { 301 } { BEI~VER\-SCHLUCKEN : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 } { BEI~BE\-R\"UH\-RUNG~MIT~DER~HAUT : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 } { BEI~BE\-R\"UH\-RUNG~MIT~DER~HAUT~(oder~dem~Haar) : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 } { BEI~EIN\-AT\-MEN : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 } { BEI~KON\-TAKT~MIT~DEN~AU\-GEN : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 } { BEI~KON\-TA\-MI\-NIER\-TER~KLEI\-DUNG : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 } { BEI~Ex\-po\-si\-tion : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 } { BEI~Ex\-po\-si\-tion~oder~falls~be\-troffen : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 } { BEI~Ex\-po\-si\-tion~oder~Un\-wohl\-sein : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 310 } { So\-fort~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 311 } { GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 312 } { Bei~Un\-wohl\-sein~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 313 } { \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 314 } { Bei~Un\-wohl\-sein~\"arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 315 } { So\-fort~\"arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 320 } { Be\-son\-de\-re~Be\-hand\-lung~drin\-gend~er\-for\-der\-lich ~(sie\-he~\l_ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
-\prop_put:Nnn \l_ghsystem_p_prop { 321 } { Be\-son\-de\-re~Be\-hand\-lung~(sie\-he~\l_ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
-\prop_put:Nnn \l_ghsystem_p_prop { 322 } { Ge\-ziel\-te~Ma\ss\-nah\-men~(sie\-he~\l_ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
-\prop_put:Nnn \l_ghsystem_p_prop { 330 } { Mund~aus\-sp\"u\-len. }
-\prop_put:Nnn \l_ghsystem_p_prop { 331 } { KEIN~Er\-bre\-chen~her\-bei\-f\"uh\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 } { Bei~Haut\-rei\-zung : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 } { Bei~Haut\-rei\-zung~oder~-aus\-schlag : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 334 } { In~kal\-tes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 } { Lo\-se~Par\-ti\-kel~von~der~Haut~ab\-b\"ur\-sten. }
-\prop_put:Nnn \l_ghsystem_p_prop { 336 } { Ver\-eis\-te~Be\-rei\-che~mit~lau\-war\-mem~Was\-ser~auf\-tau\-en.~Be\-troffe\-nen~Be\-reich~nicht~rei\-ben. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 } { Bei~an\-halten\-der~Au\-gen\-rei\-zung : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 338 } { Even\-tu\-ell~vor\-han\-de\-ne~Kon\-takt\-lin\-sen~nach~M\"og\-lich\-keit~ent\-fer\-nen.~Wei\-ter~aus\-sp\"u\-len. }
-\prop_put:Nnn \l_ghsystem_p_prop { 340 } { Die~be\-troffe\-ne~Per\-son~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
-\prop_put:Nnn \l_ghsystem_p_prop { 341 } { Bei~Atem\-be\-schwer\-den~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 } { Bei~Symp\-to\-men~der~Atem\-wege : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 350 } { Be\-hut\-sam~mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 351 } { Ei\-ni\-ge~Mi\-nu\-ten~lang~be\-hut\-sam~mit~Was\-ser~aus\-sp\"ulen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 352 } { Mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 353 } { Haut~mit~Was\-ser~ab\-wa\-schen/du\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 360 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~und~Haut~so\-fort~mit~viel~Was\-ser~ab\-wa\-schen~und~da\-nach~Klei\-dung~aus\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 361 } { Al\-le~kon\-ta\-mi\-nier\-ten~Klei\-dungs\-st\"ucke~so\-fort~aus\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 362 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~aus\-zie\-hen~und~vor~er\-neu\-tem~Tra\-gen~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 363 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~vor~er\-neu\-tem~Tra\-gen~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 } { Bei~Brand : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 } { Bei~Gro\ss\-brand~und~gro\-\ss en~Men\-gen : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 372 } { Ex\-plo\-sions\-ge\-fahr~bei~Brand. }
-\prop_put:Nnn \l_ghsystem_p_prop { 373 } { KEI\-NE~Brand\-be\-k\"ampfung,~wenn~das~Feu\-er~ex\-plo\-si\-ve~Stoffe/Ge\-mi\-sche/Er\-zeug\-nis\-se~er\-reicht. }
-\prop_put:Nnn \l_ghsystem_p_prop { 374 } { Brand\-be\-k\"ampfung~mit~\"ubli\-chen~Vor\-sichts\-ma\ss\-nah\-men~aus~an\-ge\-messe\-ner~Ent\-fer\-nung. }
-\prop_put:Nnn \l_ghsystem_p_prop { 375 } { We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 376 } { Un\-dich\-tig\-keit~be\-sei\-ti\-gen,~wenn~ge\-fahr\-los~m\"og\-lich. }
-\prop_put:Nnn \l_ghsystem_p_prop { 377 } { Brand~von~aus\-str\"o\-men\-dem~Gas: \ghsystem_text: ~ Nicht~l\"o\-schen,~bis~Un\-dich\-tig\-keit~ge\-fahr\-los~be\-sei\-tigt~wer\-den~kann. }
-\prop_put:Nnn \l_ghsystem_p_prop { 378 } { \l_ghsystem_dots_tl\ zum~L\"o\-schen~ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 380 } { Um\-ge\-bung~r\"au\-men. }
-\prop_put:Nnn \l_ghsystem_p_prop { 381 } { Alle~Z\"und\-quellen~ent\-fer\-nen,~wenn~ge\-fahr\-los~m\"og\-lich. }
-\prop_put:Nnn \l_ghsystem_p_prop { 390 } { Ver\-sch\"utte\-te~Men\-gen~auf\-neh\-men,~um~Ma\-te\-rial\-sch\"a\-den~zu~ver\-mei\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 391 } { Ver\-sch\"utte\-te~Men\-gen~auf\-neh\-men. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 310 } { BEI~VER\-SCHLUCKEN : ~ So\-fort~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 312 } { BEI~VER\-SCHLUCKEN : ~ Bei~Un\-wohl\-sein~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 330 + 331 } { BEI~VER\-SCHLUCKEN : ~ Mund~aus\-sp\"u\-len.~KEIN~Er\-brechen~her\-bei\-f\"uh\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ In~kal\-tes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 350 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ Be\-hut\-sam~mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 352 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ Mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { BEI~KON\-TAKT~MIT~DER~HAUT~(oder~dem~Haar): ~ Alle~be\-schmutz\-ten,~ge\-tr\"ank\-ten~Klei\-dungs\-st\"ucke~so\-fort~aus\-zie\-hen.~Haut~mit~Was\-ser~ab\-wa\-schen/du\-schen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 340 } { BEI~EIN\-AT\-MEN : ~ An~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 341 } { BEI~EIN\-AT\-MEN : ~ Bei~Atem\-be\-schwer\-den~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 + 351 + 338 } { BEI~KON\-TAKT~MIT~DEN~AU\-GEN : ~ Ei\-ni\-ge~Mi\-nu\-ten~lang~be\-hut\-sam~mit~Was\-ser~sp\"u\-len.~Vor\-han\-de\-ne~Kon\-takt\-lin\-sen~nach~M\"og\-lich\-keit~ent\-fer\-nen.~Wei\-ter~sp\"u\-len. }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 + 360 } { BEI~KON\-TAKT~MIT~DER~KLEI\-DUNG : ~ Kon\-ta\-mi\-nier\-te~Klei\-dung~und~Haut~so\-fort~mit~viel~Was\-ser~ab\-wa\-schen~und~da\-nach~Klei\-dung~aus\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 + 311 } { BEI~Ex\-po\-si\-tion : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 + 313 } { BEI~Ex\-po\-si\-tion~oder~falls~be \-troffen : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 + 311 } { BEI~Ex\-po\-si\-tion~oder~Un\-wohl\-sein : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 + 313 } { Bei~Haut\-rei\-zung : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 + 313 } { Bei~Haut\-rei\-zung~oder~-aus\-schlag : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { Lo\-se~Par\-ti\-kel~von~der~Haut~ab\-b\"ur\-sten.~In~kaltes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 + 313 } { Bei~an\-halten\-der~Au\-gen\-rei\-zung : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-l\-iche~Hil\-fe~hin\-zu\-zie\-hen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 + 311 } { Bei~Symp\-to\-men~der~Atem\-we\-ge : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 376 } { Bei~Brand : ~ Un\-dich\-tig\-keit~be\-sei\-ti\-gen,~wenn~ge\-fahr\-los~m\"og\-lich. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 378 } { Bei~Brand : ~ \l_ghsystem_dots_tl\ zum~L\"o\-schen~ver\-wen\-den. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 } { Bei~Brand : ~ Um\-ge\-bung~r\"au\-men. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 + 375 } { Bei~Brand : ~ Um\-ge\-bung~r\"au\-men.~We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 + 380 + 375 } { Bei~Gro\ss\-brand~und~gro\ss\-en~Men\-gen : ~ Um\-ge\-bung~r\"au\-men.~We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 } { BEI~VER\-SCHLUCKEN : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 } { BEI~BE\-R\"UH\-RUNG~MIT~DER~HAUT : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 } { BEI~BE\-R\"UH\-RUNG~MIT~DER~HAUT~(oder~dem~Haar) : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 } { BEI~EIN\-AT\-MEN : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 } { BEI~KON\-TAKT~MIT~DEN~AU\-GEN : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 } { BEI~KON\-TA\-MI\-NIER\-TER~KLEI\-DUNG : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 } { BEI~Ex\-po\-si\-tion : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 } { BEI~Ex\-po\-si\-tion~oder~falls~be\-troffen : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 } { BEI~Ex\-po\-si\-tion~oder~Un\-wohl\-sein : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 310 } { So\-fort~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 311 } { GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 312 } { Bei~Un\-wohl\-sein~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 313 } { \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 314 } { Bei~Un\-wohl\-sein~\"arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 315 } { So\-fort~\"arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 320 } { Be\-son\-de\-re~Be\-hand\-lung~drin\-gend~er\-for\-der\-lich ~(sie\-he~\l__ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
+\prop_put:Nnn \l__ghsystem_p_prop { 321 } { Be\-son\-de\-re~Be\-hand\-lung~(sie\-he~\l__ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
+\prop_put:Nnn \l__ghsystem_p_prop { 322 } { Ge\-ziel\-te~Ma\ss\-nah\-men~(sie\-he~\l__ghsystem_dots_tl\ auf~die\-sem~Kenn\-zeich\-nungs\-eti\-kett). }
+\prop_put:Nnn \l__ghsystem_p_prop { 330 } { Mund~aus\-sp\"u\-len. }
+\prop_put:Nnn \l__ghsystem_p_prop { 331 } { KEIN~Er\-bre\-chen~her\-bei\-f\"uh\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 } { Bei~Haut\-rei\-zung : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 } { Bei~Haut\-rei\-zung~oder~-aus\-schlag : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 334 } { In~kal\-tes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 } { Lo\-se~Par\-ti\-kel~von~der~Haut~ab\-b\"ur\-sten. }
+\prop_put:Nnn \l__ghsystem_p_prop { 336 } { Ver\-eis\-te~Be\-rei\-che~mit~lau\-war\-mem~Was\-ser~auf\-tau\-en.~Be\-troffe\-nen~Be\-reich~nicht~rei\-ben. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 } { Bei~an\-halten\-der~Au\-gen\-rei\-zung : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 338 } { Even\-tu\-ell~vor\-han\-de\-ne~Kon\-takt\-lin\-sen~nach~M\"og\-lich\-keit~ent\-fer\-nen.~Wei\-ter~aus\-sp\"u\-len. }
+\prop_put:Nnn \l__ghsystem_p_prop { 340 } { Die~be\-troffe\-ne~Per\-son~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
+\prop_put:Nnn \l__ghsystem_p_prop { 341 } { Bei~Atem\-be\-schwer\-den~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 } { Bei~Symp\-to\-men~der~Atem\-wege : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 350 } { Be\-hut\-sam~mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 351 } { Ei\-ni\-ge~Mi\-nu\-ten~lang~be\-hut\-sam~mit~Was\-ser~aus\-sp\"ulen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 352 } { Mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 353 } { Haut~mit~Was\-ser~ab\-wa\-schen/du\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 360 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~und~Haut~so\-fort~mit~viel~Was\-ser~ab\-wa\-schen~und~da\-nach~Klei\-dung~aus\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 361 } { Al\-le~kon\-ta\-mi\-nier\-ten~Klei\-dungs\-st\"ucke~so\-fort~aus\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 362 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~aus\-zie\-hen~und~vor~er\-neu\-tem~Tra\-gen~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 363 } { Kon\-ta\-mi\-nier\-te~Klei\-dung~vor~er\-neu\-tem~Tra\-gen~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 } { Bei~Brand : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 } { Bei~Gro\ss\-brand~und~gro\-\ss en~Men\-gen : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 372 } { Ex\-plo\-sions\-ge\-fahr~bei~Brand. }
+\prop_put:Nnn \l__ghsystem_p_prop { 373 } { KEI\-NE~Brand\-be\-k\"ampfung,~wenn~das~Feu\-er~ex\-plo\-si\-ve~Stoffe/Ge\-mi\-sche/Er\-zeug\-nis\-se~er\-reicht. }
+\prop_put:Nnn \l__ghsystem_p_prop { 374 } { Brand\-be\-k\"ampfung~mit~\"ubli\-chen~Vor\-sichts\-ma\ss\-nah\-men~aus~an\-ge\-messe\-ner~Ent\-fer\-nung. }
+\prop_put:Nnn \l__ghsystem_p_prop { 375 } { We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 376 } { Un\-dich\-tig\-keit~be\-sei\-ti\-gen,~wenn~ge\-fahr\-los~m\"og\-lich. }
+\prop_put:Nnn \l__ghsystem_p_prop { 377 } { Brand~von~aus\-str\"o\-men\-dem~Gas: \ghsystem_text: ~ Nicht~l\"o\-schen,~bis~Un\-dich\-tig\-keit~ge\-fahr\-los~be\-sei\-tigt~wer\-den~kann. }
+\prop_put:Nnn \l__ghsystem_p_prop { 378 } { \l__ghsystem_dots_tl\ zum~L\"o\-schen~ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 380 } { Um\-ge\-bung~r\"au\-men. }
+\prop_put:Nnn \l__ghsystem_p_prop { 381 } { Alle~Z\"und\-quellen~ent\-fer\-nen,~wenn~ge\-fahr\-los~m\"og\-lich. }
+\prop_put:Nnn \l__ghsystem_p_prop { 390 } { Ver\-sch\"utte\-te~Men\-gen~auf\-neh\-men,~um~Ma\-te\-rial\-sch\"a\-den~zu~ver\-mei\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 391 } { Ver\-sch\"utte\-te~Men\-gen~auf\-neh\-men. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 310 } { BEI~VER\-SCHLUCKEN : ~ So\-fort~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 312 } { BEI~VER\-SCHLUCKEN : ~ Bei~Un\-wohl\-sein~GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 330 + 331 } { BEI~VER\-SCHLUCKEN : ~ Mund~aus\-sp\"u\-len.~KEIN~Er\-brechen~her\-bei\-f\"uh\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 334 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ In~kal\-tes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 350 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ Be\-hut\-sam~mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 352 } { BEI~KON\-TAKT~MIT~DER~HAUT : ~ Mit~viel~Was\-ser~und~Sei\-fe~wa\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 + 361 + 353 } { BEI~KON\-TAKT~MIT~DER~HAUT~(oder~dem~Haar): ~ Alle~be\-schmutz\-ten,~ge\-tr\"ank\-ten~Klei\-dungs\-st\"ucke~so\-fort~aus\-zie\-hen.~Haut~mit~Was\-ser~ab\-wa\-schen/du\-schen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 340 } { BEI~EIN\-AT\-MEN : ~ An~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 341 } { BEI~EIN\-AT\-MEN : ~ Bei~Atem\-be\-schwer\-den~an~die~fri\-sche~Luft~brin\-gen~und~in~ei\-ner~Po\-si\-tion~ru\-hig\-stellen,~die~das~At\-men~er\-leich\-tert. }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 + 351 + 338 } { BEI~KON\-TAKT~MIT~DEN~AU\-GEN : ~ Ei\-ni\-ge~Mi\-nu\-ten~lang~be\-hut\-sam~mit~Was\-ser~sp\"u\-len.~Vor\-han\-de\-ne~Kon\-takt\-lin\-sen~nach~M\"og\-lich\-keit~ent\-fer\-nen.~Wei\-ter~sp\"u\-len. }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 + 360 } { BEI~KON\-TAKT~MIT~DER~KLEI\-DUNG : ~ Kon\-ta\-mi\-nier\-te~Klei\-dung~und~Haut~so\-fort~mit~viel~Was\-ser~ab\-wa\-schen~und~da\-nach~Klei\-dung~aus\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 + 311 } { BEI~Ex\-po\-si\-tion : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 + 313 } { BEI~Ex\-po\-si\-tion~oder~falls~be \-troffen : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 + 311 } { BEI~Ex\-po\-si\-tion~oder~Un\-wohl\-sein : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 + 313 } { Bei~Haut\-rei\-zung : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 + 313 } { Bei~Haut\-rei\-zung~oder~-aus\-schlag : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-li\-che~Hilfe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 + 334 } { Lo\-se~Par\-ti\-kel~von~der~Haut~ab\-b\"ur\-sten.~In~kaltes~Was\-ser~tau\-chen/nas\-sen~Ver\-band~an\-le\-gen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 + 313 } { Bei~an\-halten\-der~Au\-gen\-rei\-zung : ~ \"Arzt\-li\-chen~Rat~ein\-ho\-len/\"arzt\-l\-iche~Hil\-fe~hin\-zu\-zie\-hen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 + 311 } { Bei~Symp\-to\-men~der~Atem\-we\-ge : ~ GIFT\-IN\-FOR\-MA\-TIONS\-ZEN\-TRUM~oder~Arzt~an\-ru\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 376 } { Bei~Brand : ~ Un\-dich\-tig\-keit~be\-sei\-ti\-gen,~wenn~ge\-fahr\-los~m\"og\-lich. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 378 } { Bei~Brand : ~ \l__ghsystem_dots_tl\ zum~L\"o\-schen~ver\-wen\-den. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 } { Bei~Brand : ~ Um\-ge\-bung~r\"au\-men. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 + 375 } { Bei~Brand : ~ Um\-ge\-bung~r\"au\-men.~We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 + 380 + 375 } { Bei~Gro\ss\-brand~und~gro\ss\-en~Men\-gen : ~ Um\-ge\-bung~r\"au\-men.~We\-gen~Ex\-plo\-sions\-ge\-fahr~Brand~aus~der~Ent\-fer\-nung~be\-k\"amp\-fen. }
 
 % 3.4 Sicherheitshinweise — Aufbewahrung
-\prop_put:Nnn \l_ghsystem_p_prop { 401 } { \l_ghsystem_dots_tl\ auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 } { An~ei\-nem~trocke\-nen~Ort~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 } { An~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 404 } { In~ei\-nem~ge\-schlos\-se\-nen~Be\-h\"alter~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 405 } { Un\-ter~Ver\-schluss~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 406 } { In~ kor\-ro\-sions\-be\-st\"an\-di\-gem/\l_ghsystem_dots_tl\ Be\-h\"alter~mit~kor\-ro\-sions\-be\-st\"an\-di\-ger Aus\-klei\-dung~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 407 } { Luft\-spalt~zwi\-schen~Sta\-peln/Pa\-letten~las\-sen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 } { Vor~Son\-nen\-be\-strah\-lung~sch\"utzen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 } { Bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } ~ auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 412 } { Nicht~Tem \-pe\-ra\-tu\-ren~von~mehr~als ~ \SI { 50 } { \GHScelsius } ~ aus\-setzen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 413 } { Sch\"utt\-gut~in~Men\-gen~von~mehr~als ~ \exp_args:No \SI { \l_ghsystem_kg_mass_tl }{ \GHSkilogram } ~ bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } ~ auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 420 } { Von~an\-de\-ren~Ma\-te\-ria\-li\-en~ent\-fernt~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 422 } { In\-halt~in/un\-ter~\l_ghsystem_dots_tl\ auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 + 404 } { In~ei\-nem~ge\-schlos\-se\-nen~Be\-h\"alter~an~ei\-nem~trocke\-nen~Ort~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 233 } { Be\-h\"alter~dicht~ver\-schlos\-sen~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 235 } { K\"uhl~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-ge\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 403 } { Vor~Son\-nen\-be\-strah\-lung~ge\-sch\"utzt~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 412 } { Vor~Son\-nen\-be\-strah\-lung~sch\"utzen~und~nicht~Tem\-pe\-ra\-tu\-ren~von~mehr~als ~ \SI { 50 } { \GHScelsius } ~ aus\-setzen. }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 + 235 } { K\"uhl~und~bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } ~ auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 401 } { \l__ghsystem_dots_tl\ auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 } { An~ei\-nem~trocke\-nen~Ort~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 } { An~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 404 } { In~ei\-nem~ge\-schlos\-se\-nen~Be\-h\"alter~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 405 } { Un\-ter~Ver\-schluss~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 406 } { In~ kor\-ro\-sions\-be\-st\"an\-di\-gem/\l__ghsystem_dots_tl\ Be\-h\"alter~mit~kor\-ro\-sions\-be\-st\"an\-di\-ger Aus\-klei\-dung~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 407 } { Luft\-spalt~zwi\-schen~Sta\-peln/Pa\-letten~las\-sen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 } { Vor~Son\-nen\-be\-strah\-lung~sch\"utzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 } { Bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } ~ auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 412 } { Nicht~Tem \-pe\-ra\-tu\-ren~von~mehr~als ~ \SI { 50 } { \GHScelsius } ~ aus\-setzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 413 } { Sch\"utt\-gut~in~Men\-gen~von~mehr~als ~ \exp_args:No \SI { \l__ghsystem_kg_mass_tl }{ \GHSkilogram } ~ bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } ~ auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 420 } { Von~an\-de\-ren~Ma\-te\-ria\-li\-en~ent\-fernt~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 422 } { In\-halt~in/un\-ter~\l__ghsystem_dots_tl\ auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 + 404 } { In~ei\-nem~ge\-schlos\-se\-nen~Be\-h\"alter~an~ei\-nem~trocke\-nen~Ort~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 233 } { Be\-h\"alter~dicht~ver\-schlos\-sen~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 235 } { K\"uhl~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-ge\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 403 } { Vor~Son\-nen\-be\-strah\-lung~ge\-sch\"utzt~an~ei\-nem~gut~be\-l\"ufte\-ten~Ort~auf\-be\-wah\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 412 } { Vor~Son\-nen\-be\-strah\-lung~sch\"utzen~und~nicht~Tem\-pe\-ra\-tu\-ren~von~mehr~als ~ \SI { 50 } { \GHScelsius } ~ aus\-setzen. }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 + 235 } { K\"uhl~und~bei~Tem\-pe\-ra\-tu\-ren~von~nicht~mehr~als ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } ~ auf\-be\-wah\-ren. }
 
 % 3.5 Sicherheitshinweise — Entsorgung
-\prop_put:Nnn \l_ghsystem_p_prop { 501 } { In\-halt/Be\-h\"alter~\l_ghsystem_dots_tl\ zu\-f\"uh\-ren. }
+\prop_put:Nnn \l__ghsystem_p_prop { 501 } { In\-halt/Be\-h\"alter~\l__ghsystem_dots_tl\ zu\-f\"uh\-ren. }
 
 % 4 Gefahren-Hinweis Codes (Anhang 6 ab Seite 4)
-\prop_put:Nnn \l_ghsystem_h_prop { 350i } { Kann~bei~Ein\-at\-men~Krebs~er\-zeu\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360F } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360D } { Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361f } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361d } { Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360FD } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361fd } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Fd } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Df } { Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen.~Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 350i } { Kann~bei~Ein\-at\-men~Krebs~er\-zeu\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360F } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360D } { Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361f } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361d } { Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360FD } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361fd } { Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Fd } { Kann~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen.~Kann~ver\-mut\-lich~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Df } { Kann~das~Kind~im~Mut\-ter\-leib~sch\"a\-di\-gen.~Kann~ver\-mut\-lich~die~Frucht\-bar\-keit~be\-ein\-tr\"ach\-ti\-gen. }
 
 \ExplSyntaxOff
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def
index dde47101ca2..55fa18aba7e 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_italian.def
@@ -13,7 +13,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -31,21 +31,21 @@
 
 \ExplSyntaxOn
 % ITALIAN DEFINITIONS
-\prop_clear:N \l_ghsystem_h_prop
-\prop_clear:N \l_ghsystem_euh_prop
-\prop_clear:N \l_ghsystem_p_prop
+\prop_clear:N \l__ghsystem_h_prop
+\prop_clear:N \l__ghsystem_euh_prop
+\prop_clear:N \l__ghsystem_p_prop
 
 % table head and foot:
-\tl_set:Nn \l_ghsystem_identifier_tl { Numero }
-\tl_set:Nn \l_ghsystem_table_text_tl { Frase }
-\tl_set:Nn \l_ghsystem_table_next_page_tl { Con\-ti\-nua~nel\-la~pros\-si\-ma~pa\-gi\-na }
-\tl_set:Nn \l_ghsystem_table_caption_tl { Elen\-co~di~tut\-te~le~fra\-si~H,~EUH~e~P. }
+\tl_set:Nn \l__ghsystem_identifier_tl { Numero }
+\tl_set:Nn \l__ghsystem_table_text_tl { Frase }
+\tl_set:Nn \l__ghsystem_table_next_page_tl { Con\-ti\-nua~nel\-la~pros\-si\-ma~pa\-gi\-na }
+\tl_set:Nn \l__ghsystem_table_caption_tl { Elen\-co~di~tut\-te~le~fra\-si~H,~EUH~e~P. }
 
 % fill-in functions:
 % <state route of exposure if it is conclusively proven that no other routes of exposure cause the hazard>.
 \cs_set:Npn \ghsystem_exposure:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit
           {
@@ -59,7 +59,7 @@
 %  <state specific effect if known> 
 \cs_set:Npn \ghsystem_effect:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit
           {
@@ -73,7 +73,7 @@
 % <or state all organs affected, if known>
 \cs_set:Npn \ghsystem_organs:
   {
-    \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+    \bool_if:nT { \l__ghsystem_fill_in_bool && !\l__ghsystem_organs_bool }
       {
         \c_space_tl \textit
           {
@@ -86,7 +86,7 @@
 
 \cs_set:Npn \ghsystem_substance:
   {
-    \bool_if:NF \l_ghsystem_substance_bool
+    \bool_if:NF \l__ghsystem_substance_bool
       {
         \c_space_tl \textit
           {
@@ -100,265 +100,265 @@
 % INDICAZIONI DI PERICOLO (Allegato 3)
 % 1. Indicazioni di pericolo
 % 1.1 Pericoli fisici
-\prop_put:Nnn \l_ghsystem_h_prop { 200 } { E\-splo\-si\-vo~in\-sta\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 201 } { E\-splo\-si\-vo;~pe\-ri\-co\-lo~di~e\-splo\-sio\-ne~di~mas\-sa. }
-\prop_put:Nnn \l_ghsystem_h_prop { 202 } { E\-splo\-si\-vo;~gra\-ve~pe\-ri\-co\-lo~di~pro\-ie\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_h_prop { 203 } { E\-splo\-si\-vo;~pe\-ri\-co\-lo~di~in\-cen\-dio,~di~spo\-sta\-men\-to~d'a\-ria~o~di~pro\-ie\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_h_prop { 204 } { Pe\-ri\-co\-lo~di~in\-cen\-dio~o~di~pro\-ie\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_h_prop { 205 } { Pe\-ri\-co\-lo~di~e\-splo\-sio\-ne~di~mas\-sa~in~ca\-so~d'in\-cen\-dio. }
-\prop_put:Nnn \l_ghsystem_h_prop { 220 } { Gas~al\-ta\-men\-te~in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 221 } { Gas~in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 222 } { A\-e\-ro\-sol~al\-ta\-men\-te~in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 223 } { A\-e\-ro\-sol~in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 224 } { Li\-qui\-do~e~va\-po\-ri~al\-ta\-men\-te~in\-fiam\-ma\-bi\-li. }
-\prop_put:Nnn \l_ghsystem_h_prop { 225 } { Li\-qui\-do~e~va\-po\-ri~fa\-cil\-men\-te~in\-fiam\-ma\-bi\-li. }
-\prop_put:Nnn \l_ghsystem_h_prop { 226 } { Li\-qui\-do~e~va\-po\-ri~in\-fiam\-ma\-bi\-li. }
-\prop_put:Nnn \l_ghsystem_h_prop { 228 } { So\-li\-do~in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 240 } { Ri\-schio~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 241 } { Ri\-schio~d'in\-cen\-dio~o~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 242 } { Ri\-schio~d'in\-cen\-dio~per~ri\-scal\-da\-men\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 250 } { Spon\-ta\-ne\-a\-men\-te~in\-fiam\-ma\-bi\-le~al\-l'a\-ria. }
-\prop_put:Nnn \l_ghsystem_h_prop { 251 } { A\-u\-to\-ri\-scal\-dan\-te;~pu\`o~in\-fiam\-mar\-si. }
-\prop_put:Nnn \l_ghsystem_h_prop { 252 } { A\-u\-to\-ri\-scal\-dan\-te~in~gran\-di~quan\-ti\-t\`a;~pu\`o~in\-fiam\-mar\-si. }
-\prop_put:Nnn \l_ghsystem_h_prop { 260 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~gas~in\-fiam\-ma\-bi\-li~che~pos\-so\-no~in\-fiam\-mar\-si~spon\-ta\-ne\-a\-men\-te. }
-\prop_put:Nnn \l_ghsystem_h_prop { 261 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~gas~in\-fiam\-ma\-bi\-li. }
-\prop_put:Nnn \l_ghsystem_h_prop { 270 } { Pu\`o~pro\-vo\-ca\-re~o~ag\-gra\-va\-re~un~in\-cen\-dio;~com\-bu\-ren\-te. }
-\prop_put:Nnn \l_ghsystem_h_prop { 271 } { Pu\`o~pro\-vo\-ca\-re~un~in\-cen\-dio~o~un'e\-splo\-sio\-ne;~mol\-to~com\-bu\-ren\-te. }
-\prop_put:Nnn \l_ghsystem_h_prop { 272 } { Pu\`o~ag\-gra\-va\-re~un~in\-cen\-dio;~com\-bu\-ren\-te. }
-\prop_put:Nnn \l_ghsystem_h_prop { 280 } { Con\-tie\-ne~gas~sot\-to~pres\-sio\-ne;~pu\`o~e\-splo\-de\-re~se~ri\-scal\-da\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 281 } { Con\-tie\-ne~gas~re\-fri\-ge\-ra\-to;~pu\`o~pro\-vo\-ca\-re~u\-stio\-ni~o~le\-sio\-ni~cri\-o\-ge\-ni\-che. }
-\prop_put:Nnn \l_ghsystem_h_prop { 290 } { Pu\`o~es\-se\-re~cor\-ro\-si\-vo~per~i~me\-tal\-li. }
+\prop_put:Nnn \l__ghsystem_h_prop { 200 } { E\-splo\-si\-vo~in\-sta\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 201 } { E\-splo\-si\-vo;~pe\-ri\-co\-lo~di~e\-splo\-sio\-ne~di~mas\-sa. }
+\prop_put:Nnn \l__ghsystem_h_prop { 202 } { E\-splo\-si\-vo;~gra\-ve~pe\-ri\-co\-lo~di~pro\-ie\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_h_prop { 203 } { E\-splo\-si\-vo;~pe\-ri\-co\-lo~di~in\-cen\-dio,~di~spo\-sta\-men\-to~d'a\-ria~o~di~pro\-ie\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_h_prop { 204 } { Pe\-ri\-co\-lo~di~in\-cen\-dio~o~di~pro\-ie\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_h_prop { 205 } { Pe\-ri\-co\-lo~di~e\-splo\-sio\-ne~di~mas\-sa~in~ca\-so~d'in\-cen\-dio. }
+\prop_put:Nnn \l__ghsystem_h_prop { 220 } { Gas~al\-ta\-men\-te~in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 221 } { Gas~in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 222 } { A\-e\-ro\-sol~al\-ta\-men\-te~in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 223 } { A\-e\-ro\-sol~in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 224 } { Li\-qui\-do~e~va\-po\-ri~al\-ta\-men\-te~in\-fiam\-ma\-bi\-li. }
+\prop_put:Nnn \l__ghsystem_h_prop { 225 } { Li\-qui\-do~e~va\-po\-ri~fa\-cil\-men\-te~in\-fiam\-ma\-bi\-li. }
+\prop_put:Nnn \l__ghsystem_h_prop { 226 } { Li\-qui\-do~e~va\-po\-ri~in\-fiam\-ma\-bi\-li. }
+\prop_put:Nnn \l__ghsystem_h_prop { 228 } { So\-li\-do~in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 240 } { Ri\-schio~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 241 } { Ri\-schio~d'in\-cen\-dio~o~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 242 } { Ri\-schio~d'in\-cen\-dio~per~ri\-scal\-da\-men\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 250 } { Spon\-ta\-ne\-a\-men\-te~in\-fiam\-ma\-bi\-le~al\-l'a\-ria. }
+\prop_put:Nnn \l__ghsystem_h_prop { 251 } { A\-u\-to\-ri\-scal\-dan\-te;~pu\`o~in\-fiam\-mar\-si. }
+\prop_put:Nnn \l__ghsystem_h_prop { 252 } { A\-u\-to\-ri\-scal\-dan\-te~in~gran\-di~quan\-ti\-t\`a;~pu\`o~in\-fiam\-mar\-si. }
+\prop_put:Nnn \l__ghsystem_h_prop { 260 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~gas~in\-fiam\-ma\-bi\-li~che~pos\-so\-no~in\-fiam\-mar\-si~spon\-ta\-ne\-a\-men\-te. }
+\prop_put:Nnn \l__ghsystem_h_prop { 261 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~gas~in\-fiam\-ma\-bi\-li. }
+\prop_put:Nnn \l__ghsystem_h_prop { 270 } { Pu\`o~pro\-vo\-ca\-re~o~ag\-gra\-va\-re~un~in\-cen\-dio;~com\-bu\-ren\-te. }
+\prop_put:Nnn \l__ghsystem_h_prop { 271 } { Pu\`o~pro\-vo\-ca\-re~un~in\-cen\-dio~o~un'e\-splo\-sio\-ne;~mol\-to~com\-bu\-ren\-te. }
+\prop_put:Nnn \l__ghsystem_h_prop { 272 } { Pu\`o~ag\-gra\-va\-re~un~in\-cen\-dio;~com\-bu\-ren\-te. }
+\prop_put:Nnn \l__ghsystem_h_prop { 280 } { Con\-tie\-ne~gas~sot\-to~pres\-sio\-ne;~pu\`o~e\-splo\-de\-re~se~ri\-scal\-da\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 281 } { Con\-tie\-ne~gas~re\-fri\-ge\-ra\-to;~pu\`o~pro\-vo\-ca\-re~u\-stio\-ni~o~le\-sio\-ni~cri\-o\-ge\-ni\-che. }
+\prop_put:Nnn \l__ghsystem_h_prop { 290 } { Pu\`o~es\-se\-re~cor\-ro\-si\-vo~per~i~me\-tal\-li. }
 
 % 1.2 Pericoli per la salute
-\prop_put:Nnn \l_ghsystem_h_prop { 300 } { Le\-ta\-le~se~in\-ge\-ri\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 301 } { Tos\-si\-co~se~in\-ge\-ri\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 302 } { No\-ci\-vo~se~in\-ge\-ri\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 304 } { Pu\`o~es\-se\-re~le\-ta\-le~in~ca\-so~di~in\-ge\-stio\-ne~e~di~pe\-ne\-tra\-zio\-ne~nel\-le~vie~re\-spi\-ra\-to\-rie. }
-\prop_put:Nnn \l_ghsystem_h_prop { 310 } { Le\-ta\-le~per~con\-tat\-to~con~la~pel\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 311 } { Tos\-si\-co~per~con\-tat\-to~con~la~pel\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 312 } { No\-ci\-vo~per~con\-tat\-to~con~la~pel\-le. }
-\prop_put:Nnn \l_ghsystem_h_prop { 314 } { Pro\-vo\-ca~gra\-vi~u\-stio\-ni~cu\-ta\-ne\-e~e~gra\-vi~le\-sio\-ni~o\-cu\-la\-ri. }
-\prop_put:Nnn \l_ghsystem_h_prop { 315 } { Pro\-vo\-ca~ir\-ri\-ta\-zio\-ne~cu\-ta\-ne\-a. }
-\prop_put:Nnn \l_ghsystem_h_prop { 317 } { Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca~cu\-ta\-ne\-a. }
-\prop_put:Nnn \l_ghsystem_h_prop { 318 } { Pro\-vo\-ca~gra\-vi~le\-sio\-ni~o\-cu\-la\-ri. }
-\prop_put:Nnn \l_ghsystem_h_prop { 319 } { Pro\-vo\-ca~gra\-ve~ir\-ri\-ta\-zio\-ne~o\-cu\-la\-re. }
-\prop_put:Nnn \l_ghsystem_h_prop { 330 } { Le\-ta\-le~se~i\-na\-la\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 331 } { Tos\-si\-co~se~i\-na\-la\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 332 } { No\-ci\-vo~se~i\-na\-la\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 334 } { Pu\`o~pro\-vo\-ca\-re~sin\-to\-mi~al\-ler\-gi\-ci~o~a\-sma\-ti\-ci~o~dif\-fi\-col\-t\`a~re\-spi\-ra\-to\-rie~se~i\-na\-la\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 335 } { Pu\`o~ir\-ri\-ta\-re~le~vie~re\-spi\-ra\-to\-rie. }
-\prop_put:Nnn \l_ghsystem_h_prop { 336 } { Pu\`o~pro\-vo\-ca\-re~son\-no\-len\-za~o~ver\-ti\-gi\-ni. }
-\prop_put:Nnn \l_ghsystem_h_prop { 340 } { Pu\`o~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 341 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 350 } { Pu\`o~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 351 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 360 } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect:  \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 361 } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect: \ghsystem_exposure: .}%%% spaces gerichtet, Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 362 } { Pu\`o~es\-se\-re~no\-ci\-vo~per~i~lat\-tan\-ti~al\-lat\-ta\-ti~al~se\-no. }
-\prop_put:Nnn \l_ghsystem_h_prop { 370 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:  \ghsystem_exposure: .} %%% Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 371 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:  \ghsystem_exposure: .} %%% Punkt dazu
-\prop_put:Nnn \l_ghsystem_h_prop { 372 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta \ghsystem_exposure: .}
-\prop_put:Nnn \l_ghsystem_h_prop { 373 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l_ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta  \ghsystem_exposure: .}
+\prop_put:Nnn \l__ghsystem_h_prop { 300 } { Le\-ta\-le~se~in\-ge\-ri\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 301 } { Tos\-si\-co~se~in\-ge\-ri\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 302 } { No\-ci\-vo~se~in\-ge\-ri\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 304 } { Pu\`o~es\-se\-re~le\-ta\-le~in~ca\-so~di~in\-ge\-stio\-ne~e~di~pe\-ne\-tra\-zio\-ne~nel\-le~vie~re\-spi\-ra\-to\-rie. }
+\prop_put:Nnn \l__ghsystem_h_prop { 310 } { Le\-ta\-le~per~con\-tat\-to~con~la~pel\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 311 } { Tos\-si\-co~per~con\-tat\-to~con~la~pel\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 312 } { No\-ci\-vo~per~con\-tat\-to~con~la~pel\-le. }
+\prop_put:Nnn \l__ghsystem_h_prop { 314 } { Pro\-vo\-ca~gra\-vi~u\-stio\-ni~cu\-ta\-ne\-e~e~gra\-vi~le\-sio\-ni~o\-cu\-la\-ri. }
+\prop_put:Nnn \l__ghsystem_h_prop { 315 } { Pro\-vo\-ca~ir\-ri\-ta\-zio\-ne~cu\-ta\-ne\-a. }
+\prop_put:Nnn \l__ghsystem_h_prop { 317 } { Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca~cu\-ta\-ne\-a. }
+\prop_put:Nnn \l__ghsystem_h_prop { 318 } { Pro\-vo\-ca~gra\-vi~le\-sio\-ni~o\-cu\-la\-ri. }
+\prop_put:Nnn \l__ghsystem_h_prop { 319 } { Pro\-vo\-ca~gra\-ve~ir\-ri\-ta\-zio\-ne~o\-cu\-la\-re. }
+\prop_put:Nnn \l__ghsystem_h_prop { 330 } { Le\-ta\-le~se~i\-na\-la\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 331 } { Tos\-si\-co~se~i\-na\-la\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 332 } { No\-ci\-vo~se~i\-na\-la\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 334 } { Pu\`o~pro\-vo\-ca\-re~sin\-to\-mi~al\-ler\-gi\-ci~o~a\-sma\-ti\-ci~o~dif\-fi\-col\-t\`a~re\-spi\-ra\-to\-rie~se~i\-na\-la\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 335 } { Pu\`o~ir\-ri\-ta\-re~le~vie~re\-spi\-ra\-to\-rie. }
+\prop_put:Nnn \l__ghsystem_h_prop { 336 } { Pu\`o~pro\-vo\-ca\-re~son\-no\-len\-za~o~ver\-ti\-gi\-ni. }
+\prop_put:Nnn \l__ghsystem_h_prop { 340 } { Pu\`o~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 341 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~al\-te\-ra\-zio\-ni~ge\-ne\-ti\-che \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 350 } { Pu\`o~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 351 } { So\-spet\-ta\-to~di~pro\-vo\-ca\-re~il~can\-cro \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 360 } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect:  \ghsystem_exposure: .} %%% space gerichtet, Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 361 } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a~o~al~fe\-to \ghsystem_effect: \ghsystem_exposure: .}%%% spaces gerichtet, Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 362 } { Pu\`o~es\-se\-re~no\-ci\-vo~per~i~lat\-tan\-ti~al\-lat\-ta\-ti~al~se\-no. }
+\prop_put:Nnn \l__ghsystem_h_prop { 370 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l__ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:  \ghsystem_exposure: .} %%% Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 371 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l__ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:  \ghsystem_exposure: .} %%% Punkt dazu
+\prop_put:Nnn \l__ghsystem_h_prop { 372 } { Pro\-vo\-ca~dan\-ni \bool_if:NF \l__ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta \ghsystem_exposure: .}
+\prop_put:Nnn \l__ghsystem_h_prop { 373 } { Pu\`o~pro\-vo\-ca\-re~dan\-ni \bool_if:NF \l__ghsystem_organs_bool { ~a\-gli~or\-ga\-ni } \ghsystem_organs:\ in~ca\-so~di~e\-spo\-si\-zio\-ne~pro\-lun\-ga\-ta~o~ri\-pe\-tu\-ta  \ghsystem_exposure: .}
 
 % 1.3 Pericoli per l'ambiente
-\prop_put:Nnn \l_ghsystem_h_prop { 400 } { Mol\-to~tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci. }
-\prop_put:Nnn \l_ghsystem_h_prop { 410 } { Mol\-to~tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
-\prop_put:Nnn \l_ghsystem_h_prop { 411 } { Tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
-\prop_put:Nnn \l_ghsystem_h_prop { 412 } { No\-ci\-vo~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
-\prop_put:Nnn \l_ghsystem_h_prop { 413 } { Pu\`o~es\-se\-re~no\-ci\-vo~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
+\prop_put:Nnn \l__ghsystem_h_prop { 400 } { Mol\-to~tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci. }
+\prop_put:Nnn \l__ghsystem_h_prop { 410 } { Mol\-to~tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
+\prop_put:Nnn \l__ghsystem_h_prop { 411 } { Tos\-si\-co~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
+\prop_put:Nnn \l__ghsystem_h_prop { 412 } { No\-ci\-vo~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
+\prop_put:Nnn \l__ghsystem_h_prop { 413 } { Pu\`o~es\-se\-re~no\-ci\-vo~per~gli~or\-ga\-ni\-smi~ac\-qua\-ti\-ci~con~ef\-fet\-ti~di~lun\-ga~du\-ra\-ta. }
 
 % 2 Informazioni supplementari sui pericoli
 % 2.1 Proprieta` fisiche
-\prop_put:Nnn \l_ghsystem_euh_prop { 001 } { E\-splo\-si\-vo~al\-lo~sta\-to~sec\-co. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 006 } { E\-splo\-si\-vo~a~con\-tat\-to~o~sen\-za~con\-tat\-to~con~l'a\-ria. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 014 } { Re\-a\-gi\-sce~vio\-len\-te\-men\-te~con~l'ac\-qua. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { Du\-ran\-te~l'u\-so~pu\`o~for\-mar\-si~u\-na~mi\-sce\-la~va\-po\-re-a\-ria~e\-splo\-si\-va\slash in\-fiam\-ma\-bi\-le. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 019 } { Pu\`o~for\-ma\-re~per\-ossidi~e\-splo\-si\-vi. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 044 } { Ri\-schio~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to~in~am\-bien\-te~con\-fi\-na\-to. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 001 } { E\-splo\-si\-vo~al\-lo~sta\-to~sec\-co. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 006 } { E\-splo\-si\-vo~a~con\-tat\-to~o~sen\-za~con\-tat\-to~con~l'a\-ria. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 014 } { Re\-a\-gi\-sce~vio\-len\-te\-men\-te~con~l'ac\-qua. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 018 } { Du\-ran\-te~l'u\-so~pu\`o~for\-mar\-si~u\-na~mi\-sce\-la~va\-po\-re-a\-ria~e\-splo\-si\-va\slash in\-fiam\-ma\-bi\-le. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 019 } { Pu\`o~for\-ma\-re~per\-ossidi~e\-splo\-si\-vi. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 044 } { Ri\-schio~di~e\-splo\-sio\-ne~per~ri\-scal\-da\-men\-to~in~am\-bien\-te~con\-fi\-na\-to. }
 
 % 2.2 Proprieta` pericolose per la salute
-\prop_put:Nnn \l_ghsystem_euh_prop { 029 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~un~gas~tos\-si\-co. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 031 } { A~con\-tat\-to~con~a\-ci\-di~li\-be\-ra~gas~tos\-si\-ci. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 032 } { A~con\-tat\-to~con~a\-ci\-di~li\-be\-ra~gas~mol\-to~tos\-si\-ci. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 066 } { L'e\-spo\-si\-zio\-ne~ri\-pe\-tu\-ta~pu\`o~pro\-vo\-ca\-re~sec\-chez\-za~o~scre\-po\-la\-tu\-re~del\-la~pel\-le. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 070 } { Tos\-si\-co~per~con\-tat\-to~ocu\-la\-re. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 071 } { Cor\-ro\-si\-vo~per~le~vie~re\-spi\-ra\-to\-rie. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 029 } { A~con\-tat\-to~con~l'ac\-qua~li\-be\-ra~un~gas~tos\-si\-co. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 031 } { A~con\-tat\-to~con~a\-ci\-di~li\-be\-ra~gas~tos\-si\-ci. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 032 } { A~con\-tat\-to~con~a\-ci\-di~li\-be\-ra~gas~mol\-to~tos\-si\-ci. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 066 } { L'e\-spo\-si\-zio\-ne~ri\-pe\-tu\-ta~pu\`o~pro\-vo\-ca\-re~sec\-chez\-za~o~scre\-po\-la\-tu\-re~del\-la~pel\-le. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 070 } { Tos\-si\-co~per~con\-tat\-to~ocu\-la\-re. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 071 } { Cor\-ro\-si\-vo~per~le~vie~re\-spi\-ra\-to\-rie. }
 
 % 2.3 Proprieta` pericolose per l'ambiente
-\prop_put:Nnn \l_ghsystem_euh_prop { 059 } { Pe\-ri\-co\-lo\-so~per~lo~stra\-to~di~o\-zo\-no. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 059 } { Pe\-ri\-co\-lo\-so~per~lo~stra\-to~di~o\-zo\-no. }
 
 % 2.4 Elementi descrittivi aggiuntivi / Informazioni riguardanti particolari sostanze e miscele
-\prop_put:Nnn \l_ghsystem_euh_prop { 201 } { Con\-tie\-ne~piom\-bo.~Non~u\-ti\-liz\-za\-re~su~og\-get\-ti~che~pos\-so\-no~es\-se\-re~ma\-sti\-ca\-ti~o~suc\-chia\-ti~dai~bam\-bi\-ni. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 201A } { At\-ten\-zio\-ne!~Con\-tie\-ne~piom\-bo. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 202 } { Ciano\-acrilato.~Pe\-ri\-co\-lo.~In\-col\-la~la~pel\-le~e~gli~oc\-chi~in~po\-chi~se\-con\-di.~Te\-ne\-re~fuo\-ri~dal\-la~por\-ta\-ta~dei~bam\-bi\-ni. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 203 } { Con\-tie\-ne~\ox[pos=side]{6,cromo}.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 204 } { Con\-tie\-ne~iso\-cianati.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 205 } { Con\-tie\-ne~com\-po\-nen\-ti~epossi\-di\-ci.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 206 } { At\-ten\-zio\-ne!~Non~u\-ti\-liz\-za\-re~in~com\-bi\-na\-zio\-ne~con~al\-tri~pro\-dot\-ti.~Pos\-so\-no~li\-be\-rar\-si~gas~pe\-ri\-co\-lo\-si~(cloro). }
-\prop_put:Nnn \l_ghsystem_euh_prop { 207 } { At\-ten\-zio\-ne!~Con\-tie\-ne~cadmio.~Du\-ran\-te~l'u\-so~si~svi\-lup\-pa\-no~fu\-mi~pe\-ri\-co\-lo\-si.~Leg\-ge\-re~le~in\-for\-ma\-zio\-ni~for\-ni\-te~dal~fab\-bri\-can\-te.~Ri\-spet\-ta\-re~le~di\-spo\-si\-zio\-ni~di~si\-cu\-rez\-za. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { Con\-tie\-ne \ghsystem_substance: .~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209 } { Pu\`o~di\-ven\-ta\-re~fa\-cil\-men\-te~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209A } { Pu\`o~di\-ven\-ta\-re~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 210 } { Sche\-da~da\-ti~di~si\-cu\-rez\-za~di\-spo\-ni\-bi\-le~su~ri\-chie\-sta. }
-\prop_put:Nnn \l_ghsystem_euh_prop { 401 } { Per~e\-vi\-ta\-re~ri\-schi~per~la~sa\-lu\-te~u\-ma\-na~e~per~l'am\-bien\-te,~se\-gui\-re~le~i\-stru\-zio\-ni~per~l'u\-so. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201 } { Con\-tie\-ne~piom\-bo.~Non~u\-ti\-liz\-za\-re~su~og\-get\-ti~che~pos\-so\-no~es\-se\-re~ma\-sti\-ca\-ti~o~suc\-chia\-ti~dai~bam\-bi\-ni. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201A } { At\-ten\-zio\-ne!~Con\-tie\-ne~piom\-bo. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 202 } { Ciano\-acrilato.~Pe\-ri\-co\-lo.~In\-col\-la~la~pel\-le~e~gli~oc\-chi~in~po\-chi~se\-con\-di.~Te\-ne\-re~fuo\-ri~dal\-la~por\-ta\-ta~dei~bam\-bi\-ni. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 203 } { Con\-tie\-ne~\ox[pos=side]{6,cromo}.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 204 } { Con\-tie\-ne~iso\-cianati.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 205 } { Con\-tie\-ne~com\-po\-nen\-ti~epossi\-di\-ci.~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 206 } { At\-ten\-zio\-ne!~Non~u\-ti\-liz\-za\-re~in~com\-bi\-na\-zio\-ne~con~al\-tri~pro\-dot\-ti.~Pos\-so\-no~li\-be\-rar\-si~gas~pe\-ri\-co\-lo\-si~(cloro). }
+\prop_put:Nnn \l__ghsystem_euh_prop { 207 } { At\-ten\-zio\-ne!~Con\-tie\-ne~cadmio.~Du\-ran\-te~l'u\-so~si~svi\-lup\-pa\-no~fu\-mi~pe\-ri\-co\-lo\-si.~Leg\-ge\-re~le~in\-for\-ma\-zio\-ni~for\-ni\-te~dal~fab\-bri\-can\-te.~Ri\-spet\-ta\-re~le~di\-spo\-si\-zio\-ni~di~si\-cu\-rez\-za. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 208 } { Con\-tie\-ne \ghsystem_substance: .~Pu\`o~pro\-vo\-ca\-re~u\-na~re\-a\-zio\-ne~al\-ler\-gi\-ca. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209 } { Pu\`o~di\-ven\-ta\-re~fa\-cil\-men\-te~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209A } { Pu\`o~di\-ven\-ta\-re~in\-fiam\-ma\-bi\-le~du\-ran\-te~l'u\-so. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 210 } { Sche\-da~da\-ti~di~si\-cu\-rez\-za~di\-spo\-ni\-bi\-le~su~ri\-chie\-sta. }
+\prop_put:Nnn \l__ghsystem_euh_prop { 401 } { Per~e\-vi\-ta\-re~ri\-schi~per~la~sa\-lu\-te~u\-ma\-na~e~per~l'am\-bien\-te,~se\-gui\-re~le~i\-stru\-zio\-ni~per~l'u\-so. }
 
 % CONSIGLI DI PRUDENZA (Allegato 4, da pagina 19)
 % 3 Consigli di prudenza
 % 3.1 Consigli di prudenza di carattere generale
-\prop_put:Nnn \l_ghsystem_p_prop { 101 } { In~ca\-so~di~con\-sul\-ta\-zio\-ne~di~un~me\-di\-co,~te\-ne\-re~a~di\-spo\-si\-zio\-ne~il~con\-te\-ni\-to\-re~o~l'e\-ti\-chet\-ta~del~pro\-dot\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 102 } { Te\-ne\-re~fuo\-ri~dal\-la~por\-ta\-ta~dei~bam\-bi\-ni. }
-\prop_put:Nnn \l_ghsystem_p_prop { 103 } { Leg\-ge\-re~l'e\-ti\-chet\-ta~pri\-ma~del\-l'u\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 101 } { In~ca\-so~di~con\-sul\-ta\-zio\-ne~di~un~me\-di\-co,~te\-ne\-re~a~di\-spo\-si\-zio\-ne~il~con\-te\-ni\-to\-re~o~l'e\-ti\-chet\-ta~del~pro\-dot\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 102 } { Te\-ne\-re~fuo\-ri~dal\-la~por\-ta\-ta~dei~bam\-bi\-ni. }
+\prop_put:Nnn \l__ghsystem_p_prop { 103 } { Leg\-ge\-re~l'e\-ti\-chet\-ta~pri\-ma~del\-l'u\-so. }
 
 % 3.2 Consigli di prudenza - Prevenzione
-\prop_put:Nnn \l_ghsystem_p_prop { 201 } { Pro\-cu\-rar\-si~i\-stru\-zio\-ni~spe\-ci\-fi\-che~pri\-ma~del\-l'u\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 202 } { Non~ma\-ni\-po\-la\-re~pri\-ma~di~a\-ve\-re~let\-to~e~com\-pre\-so~tut\-te~le~av\-ver\-ten\-ze. }
-\prop_put:Nnn \l_ghsystem_p_prop { 210 } { Te\-ne\-re~lon\-ta\-no~da~fon\-ti~di~ca\-lo\-re\slash scin\-til\-le\slash fiam\-me~li\-be\-re\slash su\-per\-fi\-ci~ri\-scal\-da\-te.~ \textemdash ~Non~fu\-ma\-re. }
-\prop_put:Nnn \l_ghsystem_p_prop { 211 } { Non~va\-po\-riz\-za\-re~su~u\-na~fiam\-ma~li\-be\-ra~o~al\-tra~fon\-te~di~ac\-cen\-sio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 220 } { Te\-ne\-re\slash con\-ser\-va\-re~lon\-ta\-no~da~in\-du\-men\-ti\slash \l_ghsystem_dots_tl \slash ma\-te\-ria\-li~com\-bu\-sti\-bi\-li. }
-\prop_put:Nnn \l_ghsystem_p_prop { 221 } { Pren\-de\-re~o\-gni~pre\-cau\-zio\-ne~per~e\-vi\-ta\-re~di~mi\-sce\-la\-re~con~so\-stan\-ze~com\-bu\-sti\-bi\-li~\l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 222 } { Evi\-ta\-re~il~con\-tat\-to~con~l'a\-ria. }
-\prop_put:Nnn \l_ghsystem_p_prop { 223 } { Evi\-ta\-re~qual\-si\-a\-si~con\-tat\-to~con~l'ac\-qua:~pe\-ri\-co\-lo~di~re\-a\-zio\-ne~vio\-len\-ta~e~di~in\-fiam\-ma\-zio\-ne~spon\-ta\-nea. }
-\prop_put:Nnn \l_ghsystem_p_prop { 230 } { Man\-te\-ne\-re~u\-mi\-do~con~\l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 } { Ma\-ni\-po\-la\-re~in~at\-mo\-sfe\-ra~di~gas~i\-ner\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 232 } { Pro\-teg\-ge\-re~dal\-l'u\-mi\-di\-t\`a. }
-\prop_put:Nnn \l_ghsystem_p_prop { 233 } { Te\-ne\-re~il~re\-ci\-pien\-te~ben~chiu\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 234 } { Con\-ser\-va\-re~sol\-tan\-to~nel~con\-te\-ni\-to\-re~o\-ri\-gi\-na\-le. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco. }
-\prop_put:Nnn \l_ghsystem_p_prop { 240 } { Met\-te\-re~a~ter\-ra\slash mas\-sa~il~con\-te\-ni\-to\-re~e~il~di\-spo\-si\-ti\-vo~ri\-ce\-ven\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 241 } { U\-ti\-liz\-za\-re~im\-pian\-ti~e\-let\-tri\-ci\slash di~ven\-ti\-la\-zio\-ne\slash d'il\-lu\-mi\-na\-zio\-ne\slash \l_ghsystem_dots_tl \slash a~pro\-va~di~e\-splo\-sio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 242 } { U\-ti\-liz\-za\-re~so\-lo~u\-ten\-si\-li~an\-ti\-scin\-til\-la\-men\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 243 } { Pren\-de\-re~pre\-cau\-zio\-ni~con\-tro~le~sca\-ri\-che~e\-let\-tro\-sta\-ti\-che. }
-\prop_put:Nnn \l_ghsystem_p_prop { 244 } { Man\-te\-ne\-re~le~val\-vo\-le~di~ri\-du\-zio\-ne~li\-be\-re~da~gras\-so~e~o\-lio. }
-\prop_put:Nnn \l_ghsystem_p_prop { 250 } { E\-vi\-ta\-re~le~a\-bra\-sio\-ni\slash gli~ur\-ti\slash \l_ghsystem_dots_tl \slash gli~at\-tri\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 251 } { Re\-ci\-pien\-te~sot\-to~pres\-sio\-ne:~non~per\-fo\-ra\-re~n\'e~bru\-cia\-re,~nep\-pu\-re~do\-po~l'uso. }
-\prop_put:Nnn \l_ghsystem_p_prop { 260 } { Non~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. }
-\prop_put:Nnn \l_ghsystem_p_prop { 261 } { E\-vi\-ta\-re~di~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. }
-\prop_put:Nnn \l_ghsystem_p_prop { 262 } { E\-vi\-ta\-re~il~con\-tat\-to~con~gli~oc\-chi,~la~pel\-le~o~gli~in\-du\-men\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 263 } { E\-vi\-ta\-re~il~con\-tat\-to~du\-ran\-te~la~gra\-vi\-dan\-za\slash l'al\-lat\-ta\-men\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 264 } { La\-va\-re~ac\-cu\-ra\-ta\-men\-te~\l_ghsystem_dots_tl\ do\-po~l'u\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 270 } { Non~man\-gia\-re,~n\'e~be\-re,~n\'e~fu\-ma\-re~du\-ran\-te~l'u\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 271 } { U\-ti\-liz\-za\-re~sol\-tan\-to~al\-l'a\-per\-to~o~in~luo\-go~ben~ven\-ti\-la\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 272 } { Gli~in\-du\-men\-ti~da~la\-vo\-ro~con\-ta\-mi\-na\-ti~non~de\-vo\-no~es\-se\-re~por\-ta\-ti~fuo\-ri~dal~luo\-go~di~la\-vo\-ro. }
-\prop_put:Nnn \l_ghsystem_p_prop { 273 } { Non~di\-sper\-de\-re~nel\-l'am\-bien\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 280 } { In\-dos\-sa\-re~guan\-ti\slash in\-du\-men\-ti~pro\-tet\-ti\-vi\slash Pro\-teg\-ge\-re~gli~oc\-chi\slash il~vi\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 281 } { U\-ti\-liz\-za\-re~il~di\-spo\-si\-ti\-vo~di~pro\-te\-zio\-ne~in\-di\-vi\-dua\-le~ri\-chie\-sto. }
-\prop_put:Nnn \l_ghsystem_p_prop { 282 } { U\-ti\-liz\-za\-re~guan\-ti~ter\-mi\-ci\slash scher\-mo~fac\-cia\-le\slash Pro\-teg\-ge\-re~gli~oc\-chi. }
-\prop_put:Nnn \l_ghsystem_p_prop { 283 } { In\-dos\-sa\-re~in\-du\-men\-ti~com\-ple\-ta\-men\-te~i\-gni\-fu\-ghi~o~in~tes\-su\-ti~ri\-tar\-dan\-ti~di~fiam\-ma. }
-\prop_put:Nnn \l_ghsystem_p_prop { 284 } { U\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. }
-\prop_put:Nnn \l_ghsystem_p_prop { 285 } { In~ca\-so~di~ven\-ti\-la\-zio\-ne~in\-suf\-fi\-cien\-te~u\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 + 232 } { Ma\-ni\-po\-la\-re~in~at\-mo\-sfe\-ra~di~gas~i\-ner\-te.~Te\-ne\-re~al~ri\-pa\-ro~dal\-l'u\-mi\-di\-t\`a. }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 + 410 } { Te\-ne\-re~in~luo\-go~fre\-sco.~Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. }
+\prop_put:Nnn \l__ghsystem_p_prop { 201 } { Pro\-cu\-rar\-si~i\-stru\-zio\-ni~spe\-ci\-fi\-che~pri\-ma~del\-l'u\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 202 } { Non~ma\-ni\-po\-la\-re~pri\-ma~di~a\-ve\-re~let\-to~e~com\-pre\-so~tut\-te~le~av\-ver\-ten\-ze. }
+\prop_put:Nnn \l__ghsystem_p_prop { 210 } { Te\-ne\-re~lon\-ta\-no~da~fon\-ti~di~ca\-lo\-re\slash scin\-til\-le\slash fiam\-me~li\-be\-re\slash su\-per\-fi\-ci~ri\-scal\-da\-te.~ \textemdash ~Non~fu\-ma\-re. }
+\prop_put:Nnn \l__ghsystem_p_prop { 211 } { Non~va\-po\-riz\-za\-re~su~u\-na~fiam\-ma~li\-be\-ra~o~al\-tra~fon\-te~di~ac\-cen\-sio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 220 } { Te\-ne\-re\slash con\-ser\-va\-re~lon\-ta\-no~da~in\-du\-men\-ti\slash \l__ghsystem_dots_tl \slash ma\-te\-ria\-li~com\-bu\-sti\-bi\-li. }
+\prop_put:Nnn \l__ghsystem_p_prop { 221 } { Pren\-de\-re~o\-gni~pre\-cau\-zio\-ne~per~e\-vi\-ta\-re~di~mi\-sce\-la\-re~con~so\-stan\-ze~com\-bu\-sti\-bi\-li~\l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 222 } { Evi\-ta\-re~il~con\-tat\-to~con~l'a\-ria. }
+\prop_put:Nnn \l__ghsystem_p_prop { 223 } { Evi\-ta\-re~qual\-si\-a\-si~con\-tat\-to~con~l'ac\-qua:~pe\-ri\-co\-lo~di~re\-a\-zio\-ne~vio\-len\-ta~e~di~in\-fiam\-ma\-zio\-ne~spon\-ta\-nea. }
+\prop_put:Nnn \l__ghsystem_p_prop { 230 } { Man\-te\-ne\-re~u\-mi\-do~con~\l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 } { Ma\-ni\-po\-la\-re~in~at\-mo\-sfe\-ra~di~gas~i\-ner\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 232 } { Pro\-teg\-ge\-re~dal\-l'u\-mi\-di\-t\`a. }
+\prop_put:Nnn \l__ghsystem_p_prop { 233 } { Te\-ne\-re~il~re\-ci\-pien\-te~ben~chiu\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 234 } { Con\-ser\-va\-re~sol\-tan\-to~nel~con\-te\-ni\-to\-re~o\-ri\-gi\-na\-le. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco. }
+\prop_put:Nnn \l__ghsystem_p_prop { 240 } { Met\-te\-re~a~ter\-ra\slash mas\-sa~il~con\-te\-ni\-to\-re~e~il~di\-spo\-si\-ti\-vo~ri\-ce\-ven\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 241 } { U\-ti\-liz\-za\-re~im\-pian\-ti~e\-let\-tri\-ci\slash di~ven\-ti\-la\-zio\-ne\slash d'il\-lu\-mi\-na\-zio\-ne\slash \l__ghsystem_dots_tl \slash a~pro\-va~di~e\-splo\-sio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 242 } { U\-ti\-liz\-za\-re~so\-lo~u\-ten\-si\-li~an\-ti\-scin\-til\-la\-men\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 243 } { Pren\-de\-re~pre\-cau\-zio\-ni~con\-tro~le~sca\-ri\-che~e\-let\-tro\-sta\-ti\-che. }
+\prop_put:Nnn \l__ghsystem_p_prop { 244 } { Man\-te\-ne\-re~le~val\-vo\-le~di~ri\-du\-zio\-ne~li\-be\-re~da~gras\-so~e~o\-lio. }
+\prop_put:Nnn \l__ghsystem_p_prop { 250 } { E\-vi\-ta\-re~le~a\-bra\-sio\-ni\slash gli~ur\-ti\slash \l__ghsystem_dots_tl \slash gli~at\-tri\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 251 } { Re\-ci\-pien\-te~sot\-to~pres\-sio\-ne:~non~per\-fo\-ra\-re~n\'e~bru\-cia\-re,~nep\-pu\-re~do\-po~l'uso. }
+\prop_put:Nnn \l__ghsystem_p_prop { 260 } { Non~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. }
+\prop_put:Nnn \l__ghsystem_p_prop { 261 } { E\-vi\-ta\-re~di~re\-spi\-ra\-re~la~pol\-ve\-re\slash i~fu\-mi\slash i~gas\slash la~neb\-bia\slash i~va\-po\-ri\slash gli~aero\-sol. }
+\prop_put:Nnn \l__ghsystem_p_prop { 262 } { E\-vi\-ta\-re~il~con\-tat\-to~con~gli~oc\-chi,~la~pel\-le~o~gli~in\-du\-men\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 263 } { E\-vi\-ta\-re~il~con\-tat\-to~du\-ran\-te~la~gra\-vi\-dan\-za\slash l'al\-lat\-ta\-men\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 264 } { La\-va\-re~ac\-cu\-ra\-ta\-men\-te~\l__ghsystem_dots_tl\ do\-po~l'u\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 270 } { Non~man\-gia\-re,~n\'e~be\-re,~n\'e~fu\-ma\-re~du\-ran\-te~l'u\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 271 } { U\-ti\-liz\-za\-re~sol\-tan\-to~al\-l'a\-per\-to~o~in~luo\-go~ben~ven\-ti\-la\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 272 } { Gli~in\-du\-men\-ti~da~la\-vo\-ro~con\-ta\-mi\-na\-ti~non~de\-vo\-no~es\-se\-re~por\-ta\-ti~fuo\-ri~dal~luo\-go~di~la\-vo\-ro. }
+\prop_put:Nnn \l__ghsystem_p_prop { 273 } { Non~di\-sper\-de\-re~nel\-l'am\-bien\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 280 } { In\-dos\-sa\-re~guan\-ti\slash in\-du\-men\-ti~pro\-tet\-ti\-vi\slash Pro\-teg\-ge\-re~gli~oc\-chi\slash il~vi\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 281 } { U\-ti\-liz\-za\-re~il~di\-spo\-si\-ti\-vo~di~pro\-te\-zio\-ne~in\-di\-vi\-dua\-le~ri\-chie\-sto. }
+\prop_put:Nnn \l__ghsystem_p_prop { 282 } { U\-ti\-liz\-za\-re~guan\-ti~ter\-mi\-ci\slash scher\-mo~fac\-cia\-le\slash Pro\-teg\-ge\-re~gli~oc\-chi. }
+\prop_put:Nnn \l__ghsystem_p_prop { 283 } { In\-dos\-sa\-re~in\-du\-men\-ti~com\-ple\-ta\-men\-te~i\-gni\-fu\-ghi~o~in~tes\-su\-ti~ri\-tar\-dan\-ti~di~fiam\-ma. }
+\prop_put:Nnn \l__ghsystem_p_prop { 284 } { U\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. }
+\prop_put:Nnn \l__ghsystem_p_prop { 285 } { In~ca\-so~di~ven\-ti\-la\-zio\-ne~in\-suf\-fi\-cien\-te~u\-ti\-liz\-za\-re~un~ap\-pa\-rec\-chio~re\-spi\-ra\-to\-rio. }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 + 232 } { Ma\-ni\-po\-la\-re~in~at\-mo\-sfe\-ra~di~gas~i\-ner\-te.~Te\-ne\-re~al~ri\-pa\-ro~dal\-l'u\-mi\-di\-t\`a. }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 + 410 } { Te\-ne\-re~in~luo\-go~fre\-sco.~Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. }
 
 % 3.3 Consigli di prudenza - Reazione
-\prop_put:Nnn \l_ghsystem_p_prop { 301 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li): \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OC\-CHI: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 310 } { Con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 311 } { Con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 312 } { In~ca\-so~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 313 } { Con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 314 } { In~ca\-so~di~ma\-les\-se\-re,~con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 315 } { Con\-sul\-ta\-re~im\-me\-dia\-ta\-men\-te~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 320 } { Trat\-ta\-men\-to~spe\-ci\-fi\-co~ur\-gen\-te~(ve\-de\-re~\l_ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
-\prop_put:Nnn \l_ghsystem_p_prop { 321 } { Trat\-ta\-men\-to~spe\-ci\-fi\-co~(ve\-de\-re~\l_ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
-\prop_put:Nnn \l_ghsystem_p_prop { 322 } { Mi\-su\-re~spe\-ci\-fi\-che~(ve\-de\-re~\l_ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
-\prop_put:Nnn \l_ghsystem_p_prop { 330 } { Sciac\-qua\-re~la~boc\-ca. }
-\prop_put:Nnn \l_ghsystem_p_prop { 331 } { NON~pro\-vo\-ca\-re~il~vo\-mi\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 334 } { Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le. }
-\prop_put:Nnn \l_ghsystem_p_prop { 336 } { Sge\-la\-re~le~par\-ti~con\-ge\-la\-te~u\-san\-do~ac\-qua~tie\-pi\-da.~Non~sfre\-ga\-re~la~par\-te~in\-te\-res\-sa\-ta. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 338 } { To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. }
-\prop_put:Nnn \l_ghsystem_p_prop { 340 } { Tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 341 } { Se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 350 } { La\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 351 } { Sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 352 } { La\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 353 } { Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. }
-\prop_put:Nnn \l_ghsystem_p_prop { 360 } { Sciac\-qua\-re~im\-me\-dia\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la~pel\-le~pri\-ma~di~to\-glier\-si~gli~in\-du\-men\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 361 } { To\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 362 } { To\-glier\-si~di~dos\-so~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la\-var\-li~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 363 } { La\-va\-re~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 } { In~ca\-so~di~in\-cen\-dio: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~quan\-ti\-t\`a~ri\-le\-van\-ti: \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 372 } { Ri\-schio~di~e\-splo\-sio\-ne~in~ca\-so~di~in\-cen\-dio. }
-\prop_put:Nnn \l_ghsystem_p_prop { 373 } { NON~u\-ti\-liz\-za\-re~mez\-zi~e\-stin\-guen\-ti~se~l'in\-cen\-dio~rag\-giun\-ge~ma\-te\-ria\-li~e\-splo\-si\-vi. }
-\prop_put:Nnn \l_ghsystem_p_prop { 374 } { U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~con~le~pre\-cau\-zio\-ni~a\-bi\-tu\-a\-li~a~di\-stan\-za~ra\-gio\-ne\-vo\-le. }
-\prop_put:Nnn \l_ghsystem_p_prop { 375 } { Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
-\prop_put:Nnn \l_ghsystem_p_prop { 376 } { Bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. }
-\prop_put:Nnn \l_ghsystem_p_prop { 377 } { In~ca\-so~d'in\-cen\-dio~do\-vu\-to~a~per\-di\-ta~di~gas \ghsystem_text: , ~non~e\-stin\-gue\-re~a~me\-no~che~non~sia~pos\-si\-bi\-le~bloc\-ca\-re~la~per\-di\-ta~sen\-za~pe\-ri\-co\-lo. }
-\prop_put:Nnn \l_ghsystem_p_prop { 378 } { E\-stin\-gue\-re~con~\l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 380 } { E\-va\-cua\-re~la~zo\-na. }
-\prop_put:Nnn \l_ghsystem_p_prop { 381 } { E\-li\-mi\-na\-re~o\-gni~fon\-te~di~ac\-cen\-sio\-ne~se~non~c'\`e~pe\-ri\-co\-lo. }
-\prop_put:Nnn \l_ghsystem_p_prop { 390 } { As\-sor\-bi\-re~la~fuo\-riu\-sci\-ta~per~e\-vi\-ta\-re~dan\-ni~ma\-te\-ria\-li. }
-\prop_put:Nnn \l_ghsystem_p_prop { 391 } { Rac\-co\-glie\-re~il~ma\-te\-ria\-le~fuo\-riu\-sci\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 310 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 312 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE~ac\-com\-pa\-gna\-ta~da~ma\-les\-se\-re:~con\-tat\-ta\-re~un~CEN\-TRO AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 330 + 331 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~sciac\-qua\-re~la~boc\-ca.~NON~pro\-vo\-ca\-re~il~vo\-mi\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 350 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 352 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li):~to\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti.~Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 340 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 341 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 + 351 + 338 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OCCHI:~sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti.~To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 + 360 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI:~sciac\-qua\-re~im\-me\-dia\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la~pel\-le~pri\-ma~di~to\-glier\-si~gli~in\-du\-men\-ti. }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 + 311 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 + 313 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne,~con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 + 311 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le.~Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 + 313 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste,~con\-sul\-ta\-re~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 + 311 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri:~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 376 } { In~ca\-so~di~in\-cen\-dio:~bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 378 } { In~ca\-so~di~in\-cen\-dio:~e\-stin\-gue\-re~con~ \l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 } { E\-va\-cua\-re~la~zona~in~ca\-so~di~in\-cen\-dio. }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 + 375 } { In~ca\-so~di~in\-cen\-dio:~e\-va\-cua\-re~la~zona.~Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 + 380 + 375 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~gran\-di~quan\-ti\-t\`a:~e\-va\-cua\-re~la~zo\-na.~Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li): \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OC\-CHI: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 310 } { Con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 311 } { Con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 312 } { In~ca\-so~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 313 } { Con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 314 } { In~ca\-so~di~ma\-les\-se\-re,~con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 315 } { Con\-sul\-ta\-re~im\-me\-dia\-ta\-men\-te~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 320 } { Trat\-ta\-men\-to~spe\-ci\-fi\-co~ur\-gen\-te~(ve\-de\-re~\l__ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
+\prop_put:Nnn \l__ghsystem_p_prop { 321 } { Trat\-ta\-men\-to~spe\-ci\-fi\-co~(ve\-de\-re~\l__ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
+\prop_put:Nnn \l__ghsystem_p_prop { 322 } { Mi\-su\-re~spe\-ci\-fi\-che~(ve\-de\-re~\l__ghsystem_dots_tl\ su~que\-sta~e\-ti\-chet\-ta). }
+\prop_put:Nnn \l__ghsystem_p_prop { 330 } { Sciac\-qua\-re~la~boc\-ca. }
+\prop_put:Nnn \l__ghsystem_p_prop { 331 } { NON~pro\-vo\-ca\-re~il~vo\-mi\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 334 } { Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le. }
+\prop_put:Nnn \l__ghsystem_p_prop { 336 } { Sge\-la\-re~le~par\-ti~con\-ge\-la\-te~u\-san\-do~ac\-qua~tie\-pi\-da.~Non~sfre\-ga\-re~la~par\-te~in\-te\-res\-sa\-ta. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 338 } { To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. }
+\prop_put:Nnn \l__ghsystem_p_prop { 340 } { Tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 341 } { Se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 350 } { La\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 351 } { Sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 352 } { La\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 353 } { Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. }
+\prop_put:Nnn \l__ghsystem_p_prop { 360 } { Sciac\-qua\-re~im\-me\-dia\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la~pel\-le~pri\-ma~di~to\-glier\-si~gli~in\-du\-men\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 361 } { To\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 362 } { To\-glier\-si~di~dos\-so~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la\-var\-li~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 363 } { La\-va\-re~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~pri\-ma~di~in\-dos\-sar\-li~nuo\-va\-men\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 } { In~ca\-so~di~in\-cen\-dio: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~quan\-ti\-t\`a~ri\-le\-van\-ti: \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 372 } { Ri\-schio~di~e\-splo\-sio\-ne~in~ca\-so~di~in\-cen\-dio. }
+\prop_put:Nnn \l__ghsystem_p_prop { 373 } { NON~u\-ti\-liz\-za\-re~mez\-zi~e\-stin\-guen\-ti~se~l'in\-cen\-dio~rag\-giun\-ge~ma\-te\-ria\-li~e\-splo\-si\-vi. }
+\prop_put:Nnn \l__ghsystem_p_prop { 374 } { U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~con~le~pre\-cau\-zio\-ni~a\-bi\-tu\-a\-li~a~di\-stan\-za~ra\-gio\-ne\-vo\-le. }
+\prop_put:Nnn \l__ghsystem_p_prop { 375 } { Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
+\prop_put:Nnn \l__ghsystem_p_prop { 376 } { Bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. }
+\prop_put:Nnn \l__ghsystem_p_prop { 377 } { In~ca\-so~d'in\-cen\-dio~do\-vu\-to~a~per\-di\-ta~di~gas \ghsystem_text: , ~non~e\-stin\-gue\-re~a~me\-no~che~non~sia~pos\-si\-bi\-le~bloc\-ca\-re~la~per\-di\-ta~sen\-za~pe\-ri\-co\-lo. }
+\prop_put:Nnn \l__ghsystem_p_prop { 378 } { E\-stin\-gue\-re~con~\l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 380 } { E\-va\-cua\-re~la~zo\-na. }
+\prop_put:Nnn \l__ghsystem_p_prop { 381 } { E\-li\-mi\-na\-re~o\-gni~fon\-te~di~ac\-cen\-sio\-ne~se~non~c'\`e~pe\-ri\-co\-lo. }
+\prop_put:Nnn \l__ghsystem_p_prop { 390 } { As\-sor\-bi\-re~la~fuo\-riu\-sci\-ta~per~e\-vi\-ta\-re~dan\-ni~ma\-te\-ria\-li. }
+\prop_put:Nnn \l__ghsystem_p_prop { 391 } { Rac\-co\-glie\-re~il~ma\-te\-ria\-le~fuo\-riu\-sci\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 310 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~con\-tat\-ta\-re~im\-me\-dia\-ta\-men\-te~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 312 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE~ac\-com\-pa\-gna\-ta~da~ma\-les\-se\-re:~con\-tat\-ta\-re~un~CEN\-TRO AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 330 + 331 } { IN~CA\-SO~DI~IN\-GE\-STIO\-NE:~sciac\-qua\-re~la~boc\-ca.~NON~pro\-vo\-ca\-re~il~vo\-mi\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 334 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 350 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~de\-li\-ca\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 352 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE:~la\-va\-re~ab\-bon\-dan\-te\-men\-te~con~ac\-qua~e~sa\-po\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 + 361 + 353 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~LA~PEL\-LE~(o~con~i~ca\-pel\-li):~to\-glier\-si~di~dos\-so~im\-me\-dia\-ta\-men\-te~tut\-ti~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti.~Sciac\-qua\-re~la~pel\-le\slash fa\-re~u\-na~doc\-cia. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 340 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 341 } { IN~CA\-SO~DI~I\-NA\-LA\-ZIO\-NE:~se~la~re\-spi\-ra\-zio\-ne~\`e~dif\-fi\-ci\-le,~tra\-spor\-ta\-re~l'in\-for\-tu\-na\-to~al\-l'a\-ria~a\-per\-ta~e~man\-te\-ner\-lo~a~ri\-po\-so~in~po\-si\-zio\-ne~che~fa\-vo\-ri\-sca~la~re\-spi\-ra\-zio\-ne. }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 + 351 + 338 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~OCCHI:~sciac\-qua\-re~ac\-cu\-ra\-ta\-men\-te~per~pa\-rec\-chi~mi\-nu\-ti.~To\-glie\-re~le~e\-ven\-tua\-li~len\-ti~a~con\-tat\-to~se~\`e~a\-ge\-vo\-le~farlo.~Con\-ti\-nua\-re~a~sciac\-qua\-re. }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 + 360 } { IN~CA\-SO~DI~CON\-TAT\-TO~CON~GLI~IN\-DU\-MEN\-TI:~sciac\-qua\-re~im\-me\-dia\-ta\-men\-te~e~ab\-bon\-dan\-te\-men\-te~gli~in\-du\-men\-ti~con\-ta\-mi\-na\-ti~e~la~pel\-le~pri\-ma~di~to\-glier\-si~gli~in\-du\-men\-ti. }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 + 311 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 + 313 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~pos\-si\-bi\-le~e\-spo\-si\-zio\-ne,~con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 + 311 } { IN~CA\-SO~di~e\-spo\-si\-zio\-ne~o~di~ma\-les\-se\-re,~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 + 313 } { In~ca\-so~di~ir\-ri\-ta\-zio\-ne~o~e\-ru\-zio\-ne~del\-la~pel\-le:~con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 + 334 } { Ri\-muo\-ve\-re~le~par\-ti\-cel\-le~de\-po\-si\-ta\-te~sul\-la~pel\-le.~Im\-mer\-ge\-re~in~ac\-qua~fred\-da\slash av\-vol\-ge\-re~con~un~ben\-dag\-gio~u\-mi\-do. }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 + 313 } { Se~l'ir\-ri\-ta\-zio\-ne~de\-gli~oc\-chi~per\-si\-ste,~con\-sul\-ta\-re~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 + 311 } { In~ca\-so~di~sin\-to\-mi~re\-spi\-ra\-to\-ri:~con\-tat\-ta\-re~un~CEN\-TRO~AN\-TI\-VE\-LE\-NI~o~un~me\-di\-co. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 376 } { In~ca\-so~di~in\-cen\-dio:~bloc\-ca\-re~la~per\-di\-ta~se~non~c'\`e~pe\-ri\-co\-lo. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 378 } { In~ca\-so~di~in\-cen\-dio:~e\-stin\-gue\-re~con~ \l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 } { E\-va\-cua\-re~la~zona~in~ca\-so~di~in\-cen\-dio. }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 + 375 } { In~ca\-so~di~in\-cen\-dio:~e\-va\-cua\-re~la~zona.~Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 + 380 + 375 } { In~ca\-so~di~in\-cen\-dio~gra\-ve~e~di~gran\-di~quan\-ti\-t\`a:~e\-va\-cua\-re~la~zo\-na.~Ri\-schio~di~e\-splo\-sio\-ne.~U\-ti\-liz\-za\-re~i~mez\-zi~e\-stin\-guen\-ti~a~gran\-de~di\-stan\-za. }
 
 % 3.4 Consigli di prudenza - Conservazione
-\prop_put:Nnn \l_ghsystem_p_prop { 401 } { Con\-ser\-va\-re~ \l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 } { Con\-ser\-va\-re~in~luo\-go~a\-sciut\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 } { Con\-ser\-va\-re~in~luo\-go~ben~ven\-ti\-la\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 404 } { Con\-ser\-va\-re~in~un~re\-ci\-pien\-te~chiu\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 405 } { Con\-ser\-va\-re~sot\-to~chia\-ve. }
-\prop_put:Nnn \l_ghsystem_p_prop { 406 } { Con\-ser\-va\-re~in~re\-ci\-pien\-te~re\-si\-sten\-te~al\-la~cor\-ro\-sio\-ne\slash  \l_ghsystem_dots_tl\ prov\-vi\-sto~di~ri\-ve\-sti\-men\-to~in\-ter\-no~re\-si\-sten\-te. }
-\prop_put:Nnn \l_ghsystem_p_prop { 407 } { Man\-te\-ne\-re~u\-no~spa\-zio~li\-be\-ro~tra~gli~scaf\-fa\-li\slash i~pal\-let. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 } { Con\-ser\-va\-re~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 412 } { Non~e\-spor\-re~a~tem\-pe\-ra\-tu\-re~su\-pe\-rio\-ri~a~ \SI { 50 } { \GHScelsius } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 413 } { Con\-ser\-va\-re~le~rin\-fu\-se~di~pe\-so~su\-pe\-rio\-re~a~ \exp_args:No \SI { \l_ghsystem_kg_mass_tl }{ \GHSkilogram } ~ a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 420 } { Con\-ser\-va\-re~lon\-ta\-no~da~al\-tri~ma\-te\-ria\-li. }
-\prop_put:Nnn \l_ghsystem_p_prop { 422 } { Con\-ser\-va\-re~sot\-to~\l_ghsystem_dots_tl . }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 + 404 } { Con\-ser\-va\-re~in~luo\-go~a\-sciut\-to~e~in~reci\-pien\-te~chiu\-so. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 233 } { Te\-ne\-re~il~re\-ci\-pien\-te~ben~chiu\-so~e~in~luo\-go~ben~ven\-ti\-la\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco~e~ben~ven\-ti\-la\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 403 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri.~Con\-ser\-va\-re~in~luo\-go~ben~ven\-ti\-la\-to. }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 412 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri.~Non~e\-spor\-re~a~tem\-pe\-ra\-tu\-re~su\-pe\-rio\-ri~a~ \SI { 50 } { \GHScelsius } . }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 + 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 401 } { Con\-ser\-va\-re~ \l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 } { Con\-ser\-va\-re~in~luo\-go~a\-sciut\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 } { Con\-ser\-va\-re~in~luo\-go~ben~ven\-ti\-la\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 404 } { Con\-ser\-va\-re~in~un~re\-ci\-pien\-te~chiu\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 405 } { Con\-ser\-va\-re~sot\-to~chia\-ve. }
+\prop_put:Nnn \l__ghsystem_p_prop { 406 } { Con\-ser\-va\-re~in~re\-ci\-pien\-te~re\-si\-sten\-te~al\-la~cor\-ro\-sio\-ne\slash  \l__ghsystem_dots_tl\ prov\-vi\-sto~di~ri\-ve\-sti\-men\-to~in\-ter\-no~re\-si\-sten\-te. }
+\prop_put:Nnn \l__ghsystem_p_prop { 407 } { Man\-te\-ne\-re~u\-no~spa\-zio~li\-be\-ro~tra~gli~scaf\-fa\-li\slash i~pal\-let. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri. }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 } { Con\-ser\-va\-re~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 412 } { Non~e\-spor\-re~a~tem\-pe\-ra\-tu\-re~su\-pe\-rio\-ri~a~ \SI { 50 } { \GHScelsius } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 413 } { Con\-ser\-va\-re~le~rin\-fu\-se~di~pe\-so~su\-pe\-rio\-re~a~ \exp_args:No \SI { \l__ghsystem_kg_mass_tl }{ \GHSkilogram } ~ a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 420 } { Con\-ser\-va\-re~lon\-ta\-no~da~al\-tri~ma\-te\-ria\-li. }
+\prop_put:Nnn \l__ghsystem_p_prop { 422 } { Con\-ser\-va\-re~sot\-to~\l__ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 + 404 } { Con\-ser\-va\-re~in~luo\-go~a\-sciut\-to~e~in~reci\-pien\-te~chiu\-so. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 233 } { Te\-ne\-re~il~re\-ci\-pien\-te~ben~chiu\-so~e~in~luo\-go~ben~ven\-ti\-la\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco~e~ben~ven\-ti\-la\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 403 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri.~Con\-ser\-va\-re~in~luo\-go~ben~ven\-ti\-la\-to. }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 412 } { Pro\-teg\-ge\-re~dai~rag\-gi~so\-la\-ri.~Non~e\-spor\-re~a~tem\-pe\-ra\-tu\-re~su\-pe\-rio\-ri~a~ \SI { 50 } { \GHScelsius } . }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 + 235 } { Con\-ser\-va\-re~in~luo\-go~fre\-sco~a~tem\-pe\-ra\-tu\-re~non~su\-pe\-rio\-ri~a~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } . }
 
 % 3.5 Consigli di prudenza - Smaltimento
-\prop_put:Nnn \l_ghsystem_p_prop { 501 } { Smal\-ti\-re~il~pro\-dot\-to\slash re\-ci\-pien\-te~in~\l_ghsystem_dots_tl . }
+\prop_put:Nnn \l__ghsystem_p_prop { 501 } { Smal\-ti\-re~il~pro\-dot\-to\slash re\-ci\-pien\-te~in~\l__ghsystem_dots_tl . }
 
 % 4 Codici descrittivi di pericolo (Allegato 6, da pagina 4)
-\prop_put:Nnn \l_ghsystem_h_prop { 350i } { Pu\`o~cau\-sa\-re~il~can\-cro~se~i\-na\-la\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360F } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360D } { Pu\`o~nuo\-ce\-re~al~fe\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361f } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361d } { So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360FD } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~Pu\`o~nuo\-ce\-re~al~fe\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 361fd } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Fd } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Df } { Pu\`o~nuo\-ce\-re~al~fe\-to.~So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
+\prop_put:Nnn \l__ghsystem_h_prop { 350i } { Pu\`o~cau\-sa\-re~il~can\-cro~se~i\-na\-la\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360F } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360D } { Pu\`o~nuo\-ce\-re~al~fe\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361f } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361d } { So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360FD } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~Pu\`o~nuo\-ce\-re~al~fe\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 361fd } { So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Fd } { Pu\`o~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a.~So\-spet\-ta\-to~di~nuo\-ce\-re~al~fe\-to. }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Df } { Pu\`o~nuo\-ce\-re~al~fe\-to.~So\-spet\-ta\-to~di~nuo\-ce\-re~al\-la~fer\-ti\-li\-t\`a. }
 
 \ExplSyntaxOff
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def
index cd39ca89831..28863950bca 100644
--- a/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def
+++ b/Master/texmf-dist/tex/latex/chemmacros/language/ghsystem_langtemplate.def
@@ -5,7 +5,7 @@
 % - macros and commands for chemists                                        - %
 % --------------------------------------------------------------------------- %
 % - Clemens Niederberger                                                    - %
-% - 2012/03/03                                                              - %
+% - 2013/01/04                                                              - %
 % --------------------------------------------------------------------------- %
 % - http://www.mychemistry.eu/                                              - %
 % - contact@mychemistry.eu                                                  - %
@@ -13,7 +13,7 @@
 % - If you have any ideas, questions, suggestions or bugs to report, please - %
 % - feel free to contact me.                                                - %
 % --------------------------------------------------------------------------- %
-% - Copyright 2011-2012 Clemens Niederberger                                - %
+% - Copyright 2011-2013 Clemens Niederberger                                - %
 % -                                                                         - %
 % - This work may be distributed and/or modified under the                  - %
 % - conditions of the LaTeX Project Public License, either version 1.3      - %
@@ -74,20 +74,20 @@
 %
 \ExplSyntaxOn
 % <LANGUAGE> DEFINITIONS
-\prop_clear:N \l_ghsystem_h_prop
-\prop_clear:N \l_ghsystem_euh_prop
-\prop_clear:N \l_ghsystem_p_prop
+\prop_clear:N \l__ghsystem_h_prop
+\prop_clear:N \l__ghsystem_euh_prop
+\prop_clear:N \l__ghsystem_p_prop
 
 % table head:
-\tl_set:Nn \l_ghsystem_identifier_tl { ... }
-\tl_set:Nn \l_ghsystem_table_text_tl { ... }
-\tl_set:Nn \l_ghsystem_table_caption_tl { ... }
+\tl_set:Nn \l__ghsystem_identifier_tl { ... }
+\tl_set:Nn \l__ghsystem_table_text_tl { ... }
+\tl_set:Nn \l__ghsystem_table_caption_tl { ... }
 
 % fill-in functions:
 % <state route of exposure if it is conclusively proven that no other routes of exposure cause the hazard>.
 \cs_set:Npn \ghsystem_exposure:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit{\textless ... \textgreater}
       }
@@ -96,7 +96,7 @@
 %  <state specific effect if known> 
 \cs_set:Npn \ghsystem_effect:
   {
-    \bool_if:NT \l_ghsystem_fill_in_bool
+    \bool_if:NT \l__ghsystem_fill_in_bool
       {
         \c_space_tl \textit{\textless ... \textgreater}
       }
@@ -105,7 +105,7 @@
 % <or state all organs affected, if known>
 \cs_set:Npn \ghsystem_organs:
   {
-    \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+    \bool_if:nT { \l__ghsystem_fill_in_bool && !\l__ghsystem_organs_bool }
       {
         \c_space_tl \textit{\textless ... \textgreater}
       }
@@ -114,7 +114,7 @@
 % <name of sensitising substance>
 \cs_set:Npn \ghsystem_substance:
   {
-    \bool_if:NF \l_ghsystem_substance_bool
+    \bool_if:NF \l__ghsystem_substance_bool
       {
         \c_space_tl \textit{\textless ... \textgreater}
       }
@@ -123,265 +123,265 @@
 % HAZARD STATEMENTS (Annex 3)
 % 1. Hazard Statements
 % 1.1 Physical Hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 200 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 201 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 202 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 203 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 204 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 205 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 220 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 221 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 222 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 223 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 224 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 225 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 226 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 228 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 240 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 241 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 242 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 250 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 251 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 252 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 260 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 261 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 270 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 271 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 272 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 280 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 281 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 290 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 200 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 201 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 202 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 203 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 204 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 205 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 220 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 221 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 222 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 223 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 224 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 225 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 226 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 228 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 240 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 241 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 242 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 250 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 251 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 252 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 260 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 261 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 270 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 271 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 272 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 280 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 281 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 290 } { ... }
 
 % 1.2 Health Hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 300 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 301 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 302 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 304 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 310 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 311 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 312 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 314 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 315 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 317 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 318 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 319 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 330 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 331 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 332 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 334 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 335 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 336 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 340 } { ... \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 341 } { ... \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 350 } { ... \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 351 } { ... \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 360 } { ... \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 361 } { ... \ghsystem_effect: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 362 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 370 } { ... \bool_if:NF \l_ghsystem_organs_bool { ... } \ghsystem_organs: . \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 371 } { ... \bool_if:NF \l_ghsystem_organs_bool { ... } \ghsystem_organs: \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 372 } { ... \bool_if:NF \l_ghsystem_organs_bool { ... } \ghsystem_organs:\ ... \ghsystem_exposure: }
-\prop_put:Nnn \l_ghsystem_h_prop { 373 } { ... \bool_if:NF \l_ghsystem_organs_bool { ... } \ghsystem_organs:\ ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 300 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 301 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 302 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 304 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 310 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 311 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 312 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 314 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 315 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 317 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 318 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 319 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 330 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 331 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 332 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 334 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 335 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 336 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 340 } { ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 341 } { ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 350 } { ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 351 } { ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 360 } { ... \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 361 } { ... \ghsystem_effect: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 362 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 370 } { ... \bool_if:NF \l__ghsystem_organs_bool { ... } \ghsystem_organs: . \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 371 } { ... \bool_if:NF \l__ghsystem_organs_bool { ... } \ghsystem_organs: \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 372 } { ... \bool_if:NF \l__ghsystem_organs_bool { ... } \ghsystem_organs:\ ... \ghsystem_exposure: }
+\prop_put:Nnn \l__ghsystem_h_prop { 373 } { ... \bool_if:NF \l__ghsystem_organs_bool { ... } \ghsystem_organs:\ ... \ghsystem_exposure: }
 
 % 1.3 Environmental hazards
-\prop_put:Nnn \l_ghsystem_h_prop { 400 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 410 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 411 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 412 } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 413 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 400 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 410 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 411 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 412 } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 413 } { ... }
 
 % 2 Supplemental Hazard Informations
 % 2.1 Physical Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 001 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 006 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 014 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 018 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 019 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 044 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 001 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 006 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 014 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 018 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 019 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 044 } { ... }
 
 % 2.2 Health Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 029 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 031 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 032 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 066 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 070 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 071 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 029 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 031 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 032 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 066 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 070 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 071 } { ... }
 
 % 2.3 Environmental Properties
-\prop_put:Nnn \l_ghsystem_euh_prop { 059 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 059 } { ... }
 
 % 2.4 Supplemental Label Elements/Information On Certain Substances And Mixtures
-\prop_put:Nnn \l_ghsystem_euh_prop { 201 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 201A } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 202 } { \iupac { ... } . ~ ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 203 } { ... ~ \ox[pos=side]{ 6 , ... } . ~ ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 204 } { ... ~ \iupac { ... } . ~ ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 205 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 206 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 207 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 208 } { ... \ghsystem_substance: . ~ ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 209A } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 210 } { ... }
-\prop_put:Nnn \l_ghsystem_euh_prop { 401 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 201A } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 202 } { \iupac { ... } . ~ ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 203 } { ... ~ \ox[pos=side]{ 6 , ... } . ~ ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 204 } { ... ~ \iupac { ... } . ~ ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 205 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 206 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 207 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 208 } { ... \ghsystem_substance: . ~ ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 209A } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 210 } { ... }
+\prop_put:Nnn \l__ghsystem_euh_prop { 401 } { ... }
 
 % PRECAUTIONARY STATEMENTS (Annex 4 page 19ff)
 % 3 Precautionary Statements
 % 3.1 General
-\prop_put:Nnn \l_ghsystem_p_prop { 101 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 102 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 103 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 101 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 102 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 103 } { ... }
 
 % 3.2 Precautionary Statements — Prevention
-\prop_put:Nnn \l_ghsystem_p_prop { 201 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 202 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 210 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 211 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 220 } { ... / \l_ghsystem_dots_tl / ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 221 } { ... \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 222 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 223 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 230 } { ... ~ \l_ghsystem_dots_tl }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 232 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 233 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 234 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 240 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 241 } { ... / \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 242 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 243 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 244 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 250 } { ... / \l_ghsystem_dots_tl / ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 251 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 260 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 261 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 262 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 263 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 264 } { ... ~ \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 270 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 271 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 272 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 273 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 280 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 281 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 282 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 283 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 284 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 285 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 231 + 231 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 235 + 410 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 201 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 202 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 210 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 211 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 220 } { ... / \l__ghsystem_dots_tl / ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 221 } { ... \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 222 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 223 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 230 } { ... ~ \l__ghsystem_dots_tl }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 232 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 233 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 234 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 240 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 241 } { ... / \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 242 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 243 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 244 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 250 } { ... / \l__ghsystem_dots_tl / ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 251 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 260 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 261 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 262 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 263 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 264 } { ... ~ \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 270 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 271 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 272 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 273 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 280 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 281 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 282 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 283 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 284 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 285 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 231 + 231 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 235 + 410 } { ... }
 
 % 3.3 Precautionary Statements — Response
-\prop_put:Nnn \l_ghsystem_p_prop { 301 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 310 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 311 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 312 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 313 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 314 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 315 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 320 } { ... ~ \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 321 } { ... ~ \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 322 } { ... ~ \l_ghsystem_dots_tl\ ...}
-\prop_put:Nnn \l_ghsystem_p_prop { 330 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 331 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 334 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 336 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 338 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 340 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 341 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 350 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 351 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 352 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 353 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 360 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 361 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 362 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 363 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 } { ... : \ghsystem_text: }
-\prop_put:Nnn \l_ghsystem_p_prop { 372 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 373 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 374 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 375 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 376 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 377 } { ... : \ghsystem_text:\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 378 } { \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 380 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 381 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 390 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 391 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 310 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 312 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 301 + 330 + 331 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 334 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 350 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 302 + 352 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 303 + 361 + 353 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 340 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 304 + 341 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 305 + 351 + 338 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 306 + 360 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 307 + 311 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 308 + 313 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 309 + 311 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 332 + 313 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 333 + 313 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 335 + 334 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 337 + 313 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 342 + 311 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 376 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 378 } { ... ~ \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 370 + 380 + 375 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 371 + 380 + 375 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 310 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 311 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 312 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 313 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 314 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 315 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 320 } { ... ~ \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 321 } { ... ~ \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 322 } { ... ~ \l__ghsystem_dots_tl\ ...}
+\prop_put:Nnn \l__ghsystem_p_prop { 330 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 331 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 334 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 336 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 338 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 340 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 341 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 350 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 351 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 352 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 353 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 360 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 361 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 362 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 363 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 } { ... : \ghsystem_text: }
+\prop_put:Nnn \l__ghsystem_p_prop { 372 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 373 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 374 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 375 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 376 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 377 } { ... : \ghsystem_text:\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 378 } { \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 380 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 381 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 390 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 391 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 310 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 312 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 301 + 330 + 331 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 334 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 350 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 302 + 352 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 303 + 361 + 353 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 340 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 304 + 341 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 305 + 351 + 338 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 306 + 360 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 307 + 311 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 308 + 313 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 309 + 311 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 332 + 313 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 333 + 313 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 335 + 334 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 337 + 313 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 342 + 311 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 376 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 378 } { ... ~ \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 370 + 380 + 375 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 371 + 380 + 375 } { ... }
 
 % 3.4 Precautionary Statements — Storage
-\prop_put:Nnn \l_ghsystem_p_prop { 401 } { \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 404 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 405 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 406 } { ... / \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 407 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 } { ... ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 412 } { ... ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } ~ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 413 } { ... ~ \exp_args:No \SI { \l_ghsystem_kg_mass_tl } { \GHSkilogram } ~ ... ~ \SI { \l_ghsystem_celsius_temperature_tl } { \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 420 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 422 } { ... ~ \l_ghsystem_dots_tl\ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 402 + 404 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 233 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 403 + 235 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 403 } { ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 410 + 412 } { ... ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } ~ ... }
-\prop_put:Nnn \l_ghsystem_p_prop { 411 + 235 } { ... ~ \exp_args:No \SI { \l_ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l_ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 401 } { \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 404 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 405 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 406 } { ... / \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 407 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 } { ... ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 412 } { ... ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } ~ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 413 } { ... ~ \exp_args:No \SI { \l__ghsystem_kg_mass_tl } { \GHSkilogram } ~ ... ~ \SI { \l__ghsystem_celsius_temperature_tl } { \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 420 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 422 } { ... ~ \l__ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 402 + 404 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 233 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 403 + 235 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 403 } { ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 410 + 412 } { ... ~ \SI { 50 } { \GHScelsius } / \SI { 122 } { \GHSfahrenheit } ~ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 411 + 235 } { ... ~ \exp_args:No \SI { \l__ghsystem_celsius_temperature_tl }{ \GHScelsius } / \exp_args:No \SI { \l__ghsystem_fahrenheit_temperature_tl } { \GHSfahrenheit } ~ ... }
 
 % 3.5 Precautionary Statements — Disposal
-\prop_put:Nnn \l_ghsystem_p_prop { 501 } { ... ~ \l_ghsystem_dots_tl\ ... }
+\prop_put:Nnn \l__ghsystem_p_prop { 501 } { ... ~ \l__ghsystem_dots_tl\ ... }
 
 % 4 Hazard Statement Codes (Annex 6 page 4f)
-\prop_put:Nnn \l_ghsystem_h_prop { 350i } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 360F } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 360D } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 361f } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 361d } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 360FD } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 361fd } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Fd } { ... }
-\prop_put:Nnn \l_ghsystem_h_prop { 360Df } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 350i } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 360F } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 360D } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 361f } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 361d } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 360FD } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 361fd } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Fd } { ... }
+\prop_put:Nnn \l__ghsystem_h_prop { 360Df } { ... }
 
 \ExplSyntaxOff
\ No newline at end of file